From 763f10693a200f5c0b0b27c083325569324bb598 Mon Sep 17 00:00:00 2001 From: Edgar Date: Sat, 3 Sep 2022 13:16:53 +0200 Subject: [PATCH] :bug: Fixed OGRE not finding ZZip --- .gitignore | 3 ++- ogre/1.11/conanfile.py | 10 +++++++++- ogre/1.11/patches/FindZZip.cmake | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ogre/1.11/patches/FindZZip.cmake diff --git a/.gitignore b/.gitignore index 28c476e..4813690 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ tmp/ upload.* -.idea/ \ No newline at end of file +.idea/ +build_tmp.py \ No newline at end of file diff --git a/ogre/1.11/conanfile.py b/ogre/1.11/conanfile.py index 619de9b..05291b4 100644 --- a/ogre/1.11/conanfile.py +++ b/ogre/1.11/conanfile.py @@ -42,12 +42,20 @@ class OGREConan(ConanFile): "find_package(FreeImage)", "find_package(ConanFreeImage)", ) + tools.replace_in_file( + "CMake/Dependencies.cmake", + "find_package(ZZip)", + "find_package(ConanZZip)", + ) tools.replace_in_file( "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 "', ) - 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]: tools.patch(**patch) diff --git a/ogre/1.11/patches/FindZZip.cmake b/ogre/1.11/patches/FindZZip.cmake new file mode 100644 index 0000000..0fd2a6e --- /dev/null +++ b/ogre/1.11/patches/FindZZip.cmake @@ -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) \ No newline at end of file