Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

recipe OGRE #11102

Merged
merged 57 commits into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e3457c7
feat: initial ogre recipe
ggulgulia Jun 9, 2022
00dbce0
fix: ogre component target names
ggulgulia Jun 9, 2022
850c53b
chore: apply review suggestions
ggulgulia Jun 9, 2022
0db90df
chore: apply review suggestions
ggulgulia Jun 9, 2022
75fc7bd
chore: apply review suggestions
ggulgulia Jun 9, 2022
4eea324
chore: apply review suggestions
ggulgulia Jun 9, 2022
b55e3a1
fix: build, override openssl
ggulgulia Jun 9, 2022
e0f9dca
Merge branch 'feat-ogre-3d-recipe' of github.com:ggulgulia/conan-cent…
ggulgulia Jun 9, 2022
a56d8ba
fix: build
ggulgulia Jun 9, 2022
8d489ee
fix: build apply review suggestions
ggulgulia Jun 9, 2022
d71d846
fix: add xog system dependency
ggulgulia Jun 9, 2022
e2467b8
fix: add cppunit as requires and fixes
ggulgulia Jun 10, 2022
474e359
fix: cmake patches
ggulgulia Jun 10, 2022
72b6e7f
fix: use egl for gl support
ggulgulia Jun 13, 2022
0247970
chore: apply review suggestions
ggulgulia Jun 13, 2022
f54c4c0
chore: apply review suggestions
ggulgulia Jun 13, 2022
ff8a2f5
fix: build apply review suggestions
ggulgulia Jun 13, 2022
7a6705d
fix: apply reivew suggestions
ggulgulia Jun 13, 2022
68e132e
fix: append pthread system libs for linux os
ggulgulia Jun 13, 2022
2cf0dee
fix: configure cmake function
ggulgulia Jun 13, 2022
7c71a8c
chore: short_paths for windows
ggulgulia Jun 13, 2022
0790561
chore: limit build to compiler version less than 9
ggulgulia Jun 13, 2022
2c4589c
feat: user ogre version 1.10.2
ggulgulia Jun 14, 2022
4988eb2
fix: patch set OGRE_BINARY_DIR correctly
ggulgulia Jun 14, 2022
cad9ba2
fix: zziplib patch
ggulgulia Jun 14, 2022
e9d5ca3
fix: lint error E9004, lower case references in conanfile.py
ggulgulia Jun 14, 2022
a562138
fix: keep only version 1.x data
ggulgulia Jun 14, 2022
0202bd0
fix: use glu/system dependency
ggulgulia Jun 14, 2022
bad1963
chore: apply review suggestions
ggulgulia Jun 14, 2022
983b7df
chore: apply review suggestions
ggulgulia Jun 14, 2022
6ee2d45
fix: options in lower case, use options in configure_cmake function
ggulgulia Jun 15, 2022
8080fb9
fix: SDL2 library linking via patch
ggulgulia Jun 15, 2022
450ae65
fix: conan hook error: final end line in patch file
ggulgulia Jun 15, 2022
c1ca9eb
chore: don't build samples
ggulgulia Jun 15, 2022
76bd1ea
fix: setting off freeimage codec build, provide egl::egl in component…
ggulgulia Jun 15, 2022
d4908a9
fix: correct error message in validate method
ggulgulia Jun 15, 2022
1783fab
fix: copy licence
ggulgulia Jun 15, 2022
aebc930
fix: copy correct licence from Docs folder
ggulgulia Jun 15, 2022
b541aba
fix: copy licence, test package
ggulgulia Jun 15, 2022
a4045f3
fix: libname for debug mode, test pakage files
ggulgulia Jun 15, 2022
274a3f5
chore: correct git user data
ggulgulia Jun 15, 2022
38f5ee7
chore: remove stray line in recipe
ggulgulia Jun 15, 2022
e1cb9c8
fix: static libname
ggulgulia Jun 15, 2022
f177a05
fix: remove duplicate python component, shared dir
ggulgulia Jun 16, 2022
3f3dedb
fix: ogre headers include package info
ggulgulia Jun 17, 2022
b610bdf
chore: apply review suggestions
ggulgulia Jun 20, 2022
8259c40
chore: apply review suggestions
ggulgulia Jun 21, 2022
ee64a15
chore: apply review suggestions
ggulgulia Jun 21, 2022
36a8d9a
chore: apply review suggestions
ggulgulia Jun 21, 2022
515e0c5
fix: import ConanException
ggulgulia Jun 21, 2022
0a9140c
chore: apply review suggestions
ggulgulia Jun 21, 2022
e01b90f
chore: apply review suggestions
ggulgulia Jun 21, 2022
10fc6cf
fix: apply review suggestions, remvoe ogre_ prefix, change cxx standa…
ggulgulia Jun 23, 2022
5913fef
update: recipe with plugin component info and more
ggulgulia Jun 23, 2022
5f8cd67
fix: remove invalid EXRCodec options and components
ggulgulia Jun 23, 2022
5cdde96
fix: limit build to clang 10 and less
ggulgulia Jun 23, 2022
65d41f1
fix: check boost components in conan recipe
ggulgulia Jun 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/ogre/1.x/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
cmake_minimum_required(VERSION 3.10.2)
project(cmake_wrapper)

include(conanbuildinfo.cmake)
conan_basic_setup(TARGETS)

add_subdirectory(source_subfolder)
8 changes: 8 additions & 0 deletions recipes/ogre/1.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sources:
"1.10.2":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v1.10.2.tar.gz"
sha256: "db022c682376ace2abc45b42802048ad3a8458f5052cbc180b5fb470e4f06a53"
patches:
"1.10.2":
- base_path: "source_subfolder"
patch_file: "patches/0001-ogre-1.10.2-cmake-fixes.patch"
368 changes: 368 additions & 0 deletions recipes/ogre/1.x/conanfile.py

Large diffs are not rendered by default.

532 changes: 532 additions & 0 deletions recipes/ogre/1.x/patches/0001-ogre-1.10.2-cmake-fixes.patch

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions recipes/ogre/1.x/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.8)
project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(KEEP_RPATHS)


find_package(OGRE ${OGRE_VERSION} COMPONENTS OgreMain REQUIRED)
add_executable(ogre_main ogre_main.cpp)
target_link_libraries(ogre_main OGRE::OgreMain)

set_target_properties(ogre_main PROPERTIES
CXX_STANDARD 11
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS ON)
19 changes: 19 additions & 0 deletions recipes/ogre/1.x/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from conans import ConanFile, CMake, tools
import os

class TestPackageConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "cmake", "cmake_find_package"

def build(self):
cmake = CMake(self)
cmake.definitions["OGRE_VERSION"] = tools.Version(self.deps_cpp_info["ogre"].version)
cmake.configure()
cmake.build()

def test(self):
if tools.cross_building(self):
return

ogre_main_bin_path = os.path.join("bin", "ogre_main")
self.run(ogre_main_bin_path, run_environment=True)
17 changes: 17 additions & 0 deletions recipes/ogre/1.x/test_package/ogre_main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <OGRE/OgreRenderSystemCapabilities.h>
#include <OGRE/OgreParticle.h>
#include <OGRE/OgrePrerequisites.h>
#include <iostream>

int main(int argc, char **argv) {
Ogre::RenderSystemCapabilities rc;
rc.setNumTextureUnits(10);
std::cout << "Hello from OgreMain component\n";
std::cout << "number of texture units: " << rc.getNumTextureUnits() << "\n";

Ogre::Radian rot{0.618};
Ogre::Particle particle;
particle.resetDimensions();

return 0;
}
3 changes: 3 additions & 0 deletions recipes/ogre/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
versions:
"1.10.2":
folder: 1.x