⬆️ Updated OGRE to 13.6.2

This commit is contained in:
2023-02-08 13:14:11 +01:00
parent 0bd0d9b2ba
commit 47f39a851b
2 changed files with 9 additions and 0 deletions

View File

@ -41,6 +41,9 @@ sources:
"13.6.1": "13.6.1":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.1.tar.gz" url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.1.tar.gz"
sha256: "9fe7410fec4852daf83a52cc137226592430696b1c96896f97f677d90421a44c" sha256: "9fe7410fec4852daf83a52cc137226592430696b1c96896f97f677d90421a44c"
"13.6.2":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.6.2.tar.gz"
sha256: "76b6e7708a429bae8bf2974569eac759604c7175a43a04cfe4e43eef0ad17abf"
patches: patches:
"13.2.4": "13.2.4":
- patch_file: "patches/13.2.4/pugixml-fix.patch" - patch_file: "patches/13.2.4/pugixml-fix.patch"
@ -82,5 +85,8 @@ patches:
- patch_file: "patches/13.3.1/pugixml-fix.patch" - patch_file: "patches/13.3.1/pugixml-fix.patch"
- patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch" - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"
"13.6.1": "13.6.1":
- patch_file: "patches/13.3.1/pugixml-fix.patch"
- patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"
"13.6.2":
- patch_file: "patches/13.3.1/pugixml-fix.patch" - patch_file: "patches/13.3.1/pugixml-fix.patch"
- patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch" - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"

View File

@ -14,11 +14,13 @@ class OGREConan(ConanFile):
options = { options = {
"resourcemanager_strict": ["off", "pedantic", "strict"], "resourcemanager_strict": ["off", "pedantic", "strict"],
"nodeless_positioning": [True, False], "nodeless_positioning": [True, False],
"codec_rsimage": [True, False],
} }
default_options = { default_options = {
"resourcemanager_strict": "strict", "resourcemanager_strict": "strict",
"nodeless_positioning": False, "nodeless_positioning": False,
"codec_rsimage": False,
} }
def export_sources(self): def export_sources(self):
@ -71,6 +73,7 @@ class OGREConan(ConanFile):
tc.variables["OGRE_COPY_DEPENDENCIES"] = "OFF" tc.variables["OGRE_COPY_DEPENDENCIES"] = "OFF"
tc.variables["OGRE_INSTALL_DEPENDENCIES"] = "OFF" tc.variables["OGRE_INSTALL_DEPENDENCIES"] = "OFF"
tc.variables["OGRE_INSTALL_SAMPLES"] = "OFF" tc.variables["OGRE_INSTALL_SAMPLES"] = "OFF"
tc.variables["OGRE_BUILD_PLUGIN_RSIMAGE"] = self.options.codec_rsimage
tc.variables["OGRE_NODELESS_POSITIONING"] = self.options.nodeless_positioning tc.variables["OGRE_NODELESS_POSITIONING"] = self.options.nodeless_positioning
if self.options.resourcemanager_strict == "off": if self.options.resourcemanager_strict == "off":