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

🐛 Fixed OGRE not finding ZZip

Browse Source
This commit is contained in:
Edgar 2022-09-03 13:16:53 +02:00
parent 9b4dc66aac
commit 763f10693a
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,4 +1,5 @@
build/ build/
tmp/ tmp/
upload.* upload.*
.idea/ .idea/
build_tmp.py

10
ogre/1.11/conanfile.py
View File

@ -42,12 +42,20 @@ class OGREConan(ConanFile):
"find_package(FreeImage)", "find_package(FreeImage)",
"find_package(ConanFreeImage)", "find_package(ConanFreeImage)",
) )
tools.replace_in_file(
"CMake/Dependencies.cmake",
"find_package(ZZip)",
"find_package(ConanZZip)",
)
tools.replace_in_file( tools.replace_in_file(
"CMake/Packages/FindDirectX11.cmake", "CMake/Packages/FindDirectX11.cmake",
'find_path(DirectX11_INCLUDE_DIR NAMES d3d11.h HINTS "', '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 "', 'find_path(DirectX11_INCLUDE_DIR NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NAMES d3d11.h HINTS "',
) )
shutil.copyfile("patches/FindFreeImage.cmake", "CMake/Packages/FindConanFreeImage.cmake") shutil.copyfile(
"patches/FindFreeImage.cmake", "CMake/Packages/FindConanFreeImage.cmake"
)
shutil.copyfile("patches/FindZZip.cmake", "CMake/Packages/FindConanZZip.cmake")
for patch in self.conan_data["patches"][self.version]: for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch) tools.patch(**patch)

5
ogre/1.11/patches/FindZZip.cmake Normal file
View File

@ -0,0 +1,5 @@
include(Findzziplib)
set(ZZip_FOUND "${zziplib_FOUND}" CACHE BOOL "Conan patch for zziplib" FORCE)
set(ZZip_INCLUDE_DIRS "${zziplib_INCLUDE_DIR}" CACHE STRING "Conan patch for zziplib" FORCE)
set(ZZip_LIBRARIES "${zziplib_LIBRARIES}" CACHE STRING "Conan patch for zziplib" FORCE)