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

🐛 Fixed OGRE 1.11 debug build again

Browse Source
This commit is contained in:
Edgar 2021-09-04 14:55:57 +00:00 committed by GitHub
parent 595cdd8377
commit 6f66f4939c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ogre/1.11/conandata.yml
View File

@ -6,7 +6,7 @@ patches:
"1.11.6.1":
- patch_file: "patches/1.11.6.1/CMakeLists.txt.patch"
- patch_file: "patches/1.11.6.1/Samples-CMakeList.txt.patch"
- patch_file: "patches/1.11.6.1/FindPkgMacros.cmake.patch"
- patch_file: "patches/1.11.6.1/FixOverlayCMakeLists.txt.patch"
requirements:
- "zlib/[1.x]"
- "zziplib/[0.13.x]"

11
ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch
View File

@ -1,11 +0,0 @@
--- 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)

11
ogre/1.11/patches/1.11.6.1/FixOverlayCMakeLists.txt.patch Normal file
View File

@ -0,0 +1,11 @@
--- Components/Overlay/CMakeLists.txt
+++ Components/Overlay/CMakeLists.txt
@@ -21,7 +21,7 @@
# setup target
add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION})
-target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB)
+target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE Freetype::Freetype ZLIB::ZLIB)
target_include_directories(OgreOverlay PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
$<INSTALL_INTERFACE:include/OGRE/Overlay>