⬆️ Updated ogre 13.5.0

This commit is contained in:
Edgar 2022-10-30 14:39:56 +01:00
parent 2fbd9faa87
commit 4ab521cf9f
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
3 changed files with 18 additions and 7 deletions

View File

@ -23,6 +23,9 @@ sources:
"13.4.4":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.4.4.tar.gz"
sha256: "7cf05dbb3acbfc9326daecb60429a8ae9ce7625fb425e6a29de00cf77454596f"
"13.5.0":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.5.0.tar.gz"
sha256: "94d514d03d421c43af09e916ecd127685e15afed62e2f4cde8949b7818bc4900"
patches:
"13.2.4":
- patch_file: "patches/13.2.4/pugixml-fix.patch"
@ -48,3 +51,6 @@ patches:
"13.4.4":
- patch_file: "patches/13.3.1/pugixml-fix.patch"
- patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"
"13.5.0":
- patch_file: "patches/13.3.1/pugixml-fix.patch"
- patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"

View File

@ -1,5 +1,5 @@
from conan import ConanFile
from conan.tools.files import get, collect_libs,copy, replace_in_file, apply_conandata_patches, export_conandata_patches
from conan.tools.files import get, collect_libs, rmdir, replace_in_file, apply_conandata_patches, export_conandata_patches
from conan.tools.cmake import CMakeToolchain, CMake, CMakeDeps, cmake_layout
from conan.tools.system.package_manager import Apt
import os
@ -87,17 +87,22 @@ class OGREConan(ConanFile):
def _patch_sources(self):
apply_conandata_patches(self)
replace_in_file(self,
os.path.join(self.source_folder,"CMake/Dependencies.cmake"),
os.path.join(self.source_folder, "CMake/Dependencies.cmake"),
"find_package(DirectX)",
"find_package(DirectX9)",
)
replace_in_file(self,
os.path.join(self.source_folder,"PlugIns/FreeImageCodec/CMakeLists.txt"),
os.path.join(self.source_folder, "PlugIns/FreeImageCodec/CMakeLists.txt"),
"${FreeImage_LIBRARIES}",
"freeimage::FreeImage",
)
replace_in_file(self,
os.path.join(self.source_folder,"CMake/Packages/FindDirectX11.cmake"),
os.path.join(self.source_folder, "Components/Overlay/CMakeLists.txt"),
"${FREETYPE_LIBRARIES}",
"freetype",
)
replace_in_file(self,
os.path.join(self.source_folder, "CMake/Packages/FindDirectX11.cmake"),
'find_path(DirectX11_INCLUDE_DIR NAMES d3d11.h HINTS "',
'find_path(DirectX11_INCLUDE_DIR NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NAMES d3d11.h HINTS "',
)
@ -111,6 +116,8 @@ class OGREConan(ConanFile):
def package(self):
cmake = CMake(self)
cmake.install()
rmdir(self, os.path.join(self.package_folder, "CMake"))
rmdir(self, os.path.join(self.package_folder, "Docs"))
def package_info(self):
self.cpp_info.set_property("cmake_module_file_name", "OGRE")

View File

@ -1,5 +1,3 @@
versions:
"1.11.6.1":
folder: "1.11"
"13.4.4":
"13.5.0":
folder: "13"