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

🐛 Fixed OGRE debug build on Linux

Browse Source
This commit is contained in:
Edgar
2021-08-16 09:25:29 +00:00
parent 1cd12b8162
commit f44c04fab1
6 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ogre/13/conandata.yml
View File

@ -7,6 +7,7 @@ patches:
- patch_file: "patches/13.0.0/CMakeLists.txt.patch"
- patch_file: "patches/13.0.0/AddLibPNG.patch"
- patch_file: "patches/13.0.0/pugixml-fix.patch"
- patch_file: "patches/13.0.0/FindPkgMacros.cmake.patch"
requirements:
- "zlib/[1.x]"
- "zziplib/[0.13.x]"

11
ogre/13/patches/13.0.0/FindPkgMacros.cmake.patch Normal file
View File

@ -0,0 +1,11 @@
--- CMake/Utils/FindPkgMacros.cmake
+++ CMake/Utils/FindPkgMacros.cmake
@@ -82,7 +82,7 @@
if (${PREFIX}_FWK)
set(${PREFIX} ${${PREFIX}_FWK})
elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
+ set(${PREFIX} "$<$<CONFIG:Debug>:${${PREFIX}_DBG}>$<$<NOT:$<CONFIG:Debug>>:${${PREFIX}_REL}>")
elseif (${PREFIX}_REL)
set(${PREFIX} ${${PREFIX}_REL})
elseif (${PREFIX}_DBG)