diff --git a/ogre/1.11/conandata.yml b/ogre/1.11/conandata.yml index 53f2697..79a3702 100644 --- a/ogre/1.11/conandata.yml +++ b/ogre/1.11/conandata.yml @@ -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]" diff --git a/ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch b/ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch deleted file mode 100644 index 6d62fc4..0000000 --- a/ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch +++ /dev/null @@ -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} "$<$:${${PREFIX}_DBG}>$<$>:${${PREFIX}_REL}>") - elseif (${PREFIX}_REL) - set(${PREFIX} ${${PREFIX}_REL}) - elseif (${PREFIX}_DBG) diff --git a/ogre/1.11/patches/1.11.6.1/FixOverlayCMakeLists.txt.patch b/ogre/1.11/patches/1.11.6.1/FixOverlayCMakeLists.txt.patch new file mode 100644 index 0000000..615204f --- /dev/null +++ b/ogre/1.11/patches/1.11.6.1/FixOverlayCMakeLists.txt.patch @@ -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 + "$" + $