From f44c04fab195fbf4ae28ec71eb3107946922270b Mon Sep 17 00:00:00 2001 From: Edgar Date: Mon, 16 Aug 2021 09:25:29 +0000 Subject: [PATCH] :bug: Fixed OGRE debug build on Linux --- build.py | 4 ++-- ogre/1.11/conandata.yml | 1 + ogre/1.11/patches/1.11.6.1/AddLibPNG.patch | 2 +- ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch | 11 +++++++++++ ogre/13/conandata.yml | 1 + ogre/13/patches/13.0.0/FindPkgMacros.cmake.patch | 11 +++++++++++ 6 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch create mode 100644 ogre/13/patches/13.0.0/FindPkgMacros.cmake.patch diff --git a/build.py b/build.py index 9c54ce1..21e29bb 100644 --- a/build.py +++ b/build.py @@ -30,8 +30,8 @@ for pkg in packages: system(f"conan export {pkg}") for pkg in packages: - system(f"conan create {pkg} -s=build_type=Release -k -b=missing") - system(f"conan create {pkg} -s=build_type=Debug -k -b=missing") + system(f"conan create {pkg} -s=build_type=Release -k -b=outdated") + system(f"conan create {pkg} -s=build_type=Debug -k -b=outdated") data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run(['conan','search','*','--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split())) diff --git a/ogre/1.11/conandata.yml b/ogre/1.11/conandata.yml index f22f168..951e44c 100644 --- a/ogre/1.11/conandata.yml +++ b/ogre/1.11/conandata.yml @@ -8,6 +8,7 @@ patches: - patch_file: "patches/1.11.6.1/Dependencies.cmake.patch" - patch_file: "patches/1.11.6.1/Samples-CMakeList.txt.patch" - patch_file: "patches/1.11.6.1/AddLibPNG.patch" + - patch_file: "patches/1.11.6.1/FindPkgMacros.cmake.patch" requirements: - "zlib/[1.x]" - "zziplib/[0.13.x]" diff --git a/ogre/1.11/patches/1.11.6.1/AddLibPNG.patch b/ogre/1.11/patches/1.11.6.1/AddLibPNG.patch index 7b84ddb..5680041 100644 --- a/ogre/1.11/patches/1.11.6.1/AddLibPNG.patch +++ b/ogre/1.11/patches/1.11.6.1/AddLibPNG.patch @@ -26,7 +26,7 @@ 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_LIBRARIES}" ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB) ++target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE Freetype::Freetype ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB) target_include_directories(OgreOverlay PUBLIC "$" $ 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 new file mode 100644 index 0000000..6d62fc4 --- /dev/null +++ b/ogre/1.11/patches/1.11.6.1/FindPkgMacros.cmake.patch @@ -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} "$<$:${${PREFIX}_DBG}>$<$>:${${PREFIX}_REL}>") + elseif (${PREFIX}_REL) + set(${PREFIX} ${${PREFIX}_REL}) + elseif (${PREFIX}_DBG) diff --git a/ogre/13/conandata.yml b/ogre/13/conandata.yml index b9d5516..101fa2f 100644 --- a/ogre/13/conandata.yml +++ b/ogre/13/conandata.yml @@ -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]" diff --git a/ogre/13/patches/13.0.0/FindPkgMacros.cmake.patch b/ogre/13/patches/13.0.0/FindPkgMacros.cmake.patch new file mode 100644 index 0000000..6d62fc4 --- /dev/null +++ b/ogre/13/patches/13.0.0/FindPkgMacros.cmake.patch @@ -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} "$<$:${${PREFIX}_DBG}>$<$>:${${PREFIX}_REL}>") + elseif (${PREFIX}_REL) + set(${PREFIX} ${${PREFIX}_REL}) + elseif (${PREFIX}_DBG)