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

🐛 Fixed FindDirectX11 finding the old version of the DX SDK

Browse Source
This commit is contained in:
Edgar 2022-03-23 16:27:46 +01:00
parent d11b528f71
commit 6d315331f9
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ogre/1.11/conanfile.py
View File

@ -36,6 +36,11 @@ class OGREConan(ConanFile):
"find_package(DirectX)", "find_package(DirectX)",
"find_package(DirectX9)", "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]: for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch) tools.patch(**patch)

5
ogre/1.12/conanfile.py
View File

@ -38,6 +38,11 @@ class OGREConan(ConanFile):
"find_package(DirectX)", "find_package(DirectX)",
"find_package(DirectX9)", "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]: for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch) tools.patch(**patch)

5
ogre/13/conanfile.py
View File

@ -85,6 +85,11 @@ class OGREConan(ConanFile):
"find_package(DirectX)", "find_package(DirectX)",
"find_package(DirectX9)", "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]: for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch) tools.patch(**patch)