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
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.py
View File

@ -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()))

1
ogre/1.11/conandata.yml
View File

@ -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]"

2
ogre/1.11/patches/1.11.6.1/AddLibPNG.patch
View File

@ -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
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
$<INSTALL_INTERFACE:include/OGRE/Overlay>

11
ogre/1.11/patches/1.11.6.1/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)

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)