From 6d315331f92e54beffc61feebcd0218f6fab39e2 Mon Sep 17 00:00:00 2001 From: Edgar Date: Wed, 23 Mar 2022 16:27:46 +0100 Subject: [PATCH] :bug: Fixed FindDirectX11 finding the old version of the DX SDK --- ogre/1.11/conanfile.py | 5 +++++ ogre/1.12/conanfile.py | 5 +++++ ogre/13/conanfile.py | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/ogre/1.11/conanfile.py b/ogre/1.11/conanfile.py index 34ce0ff..42ebb20 100644 --- a/ogre/1.11/conanfile.py +++ b/ogre/1.11/conanfile.py @@ -36,6 +36,11 @@ class OGREConan(ConanFile): "find_package(DirectX)", "find_package(DirectX9)", ) + 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 \"", + ) for patch in self.conan_data["patches"][self.version]: tools.patch(**patch) diff --git a/ogre/1.12/conanfile.py b/ogre/1.12/conanfile.py index 1ec0d9d..c46fc26 100644 --- a/ogre/1.12/conanfile.py +++ b/ogre/1.12/conanfile.py @@ -38,6 +38,11 @@ class OGREConan(ConanFile): "find_package(DirectX)", "find_package(DirectX9)", ) + 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 \"", + ) for patch in self.conan_data["patches"][self.version]: tools.patch(**patch) diff --git a/ogre/13/conanfile.py b/ogre/13/conanfile.py index adc2ec3..1ddf05d 100644 --- a/ogre/13/conanfile.py +++ b/ogre/13/conanfile.py @@ -85,6 +85,11 @@ class OGREConan(ConanFile): "find_package(DirectX)", "find_package(DirectX9)", ) + 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 \"", + ) for patch in self.conan_data["patches"][self.version]: tools.patch(**patch)