AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🔧 Update ogre-next to 2022.10

Browse Source
This commit is contained in:
Edgar 2022-11-09 13:35:56 +01:00
parent c45516ad8e
commit 48367f6c6b
No known key found for this signature in database
GPG Key ID: 9AA5DDFFCBDCE46A
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ogre/2.3/conandata.yml
View File

@ -1,7 +1,4 @@
sources: sources:
"2.3.1": "2022.10":
url: "https://github.com/OGRECave/ogre-next/archive/refs/tags/v2.3.1.tar.gz" url: "https://github.com/OGRECave/ogre-next/archive/ede1690bb3dcf932df6a06f06e9e6de585e5eeea.tar.gz"
sha256: "38dd0d5ba5759ee47c71552c5dacf44dad5fe61868025dcbd5ea6a6bdb6bc8e4" sha256: "6baf05cc4dc14cb70b6f4a958dbc7ac79a209eb9658733d0b19f651a5f96da08"
patches:
"2.3.1":
- patch_file: "patches/2.3.1/RapidJSON-fix.patch"

22
ogre/2.3/conanfile.py
View File

@ -42,12 +42,13 @@ class OGRENextConan(ConanFile):
def generate(self): def generate(self):
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
tc.variables["OGRE_BUILD_COMPONENT_ATMOSPHERE"] = "ON"
tc.variables["OGRE_BUILD_COMPONENT_BITES"] = "ON" tc.variables["OGRE_BUILD_COMPONENT_BITES"] = "ON"
tc.variables["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" tc.variables["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF"
tc.variables["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" tc.variables["OGRE_BUILD_COMPONENT_JAVA"] = "OFF"
tc.variables["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" tc.variables["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON"
tc.variables["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF" tc.variables["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF"
tc.variables["OGRE_BUILD_COMPONENT_TERRAIN"] = "OFF"# This is borked tc.variables["OGRE_BUILD_COMPONENT_TERRAIN"] = "ON"
tc.variables["OGRE_BUILD_DEPENDENCIES"] = "OFF" tc.variables["OGRE_BUILD_DEPENDENCIES"] = "OFF"
tc.variables["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "OFF" tc.variables["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "OFF"
tc.variables["OGRE_BUILD_PLUGIN_EXRCODEC"] = "OFF" tc.variables["OGRE_BUILD_PLUGIN_EXRCODEC"] = "OFF"
@ -71,7 +72,6 @@ class OGRENextConan(ConanFile):
""" """
find_package(RapidJSON) find_package(RapidJSON)
set(Rapidjson_FOUND TRUE) set(Rapidjson_FOUND TRUE)
add_library(RapidJSON::RapidJSON ALIAS rapidjson)
""", """,
) )
replace_in_file(self, replace_in_file(self,
@ -84,6 +84,11 @@ class OGRENextConan(ConanFile):
"# Install dependencies", "# Install dependencies",
"return()", "return()",
) )
replace_in_file(self,
os.path.join(self.source_folder, "OgreMain/CMakeLists.txt"),
"target_link_libraries(${OGRE_NEXT}Main ${LIBRARIES})",
"target_link_libraries(${OGRE_NEXT}Main ${LIBRARIES} rapidjson freeimage::FreeImage)",
)
def build(self): def build(self):
@ -106,17 +111,28 @@ class OGRENextConan(ConanFile):
self.cpp_info.includedirs = [ self.cpp_info.includedirs = [
"include", "include",
"include/OGRE", "include/OGRE",
"include/OGRE/Animation",
"include/OGRE/Atmosphere",
"include/OGRE/Bites", "include/OGRE/Bites",
"include/OGRE/Compositor",
"include/OGRE/Deprecated",
"include/OGRE/HLMS", "include/OGRE/HLMS",
"include/OGRE/HLMS/Common",
"include/OGRE/HLMS/Pbs",
"include/OGRE/HLMS/Unlit",
"include/OGRE/Math",
"include/OGRE/MeshLodGenerator", "include/OGRE/MeshLodGenerator",
"include/OGRE/Overlay", "include/OGRE/Overlay",
"include/OGRE/Paging", "include/OGRE/Paging",
"include/OGRE/Plugins", "include/OGRE/Plugins",
"include/OGRE/Property", "include/OGRE/Property",
"include/OGRE/RenderSystems",
"include/OGRE/RTShaderSystem", "include/OGRE/RTShaderSystem",
"include/OGRE/RenderSystems",
"include/OGRE/Terrain", "include/OGRE/Terrain",
"include/OGRE/Threading", "include/OGRE/Threading",
"include/OGRE/Threading",
"include/OGRE/Volume", "include/OGRE/Volume",
] ]
# Directories where libraries can be found
self.cpp_info.libdirs = ['lib', f'lib/{self.settings.build_type}']
self.cpp_info.libs = collect_libs(self) self.cpp_info.libs = collect_libs(self)