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

🐛 Fixed ogre 1.11 build with conan V2

Browse Source
This commit is contained in:
Edgar
2022-11-14 18:16:38 +01:00
parent 48367f6c6b
commit da749af80e
6 changed files with 87 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,11 @@
--- a/PlugIns/FreeImageCodec/CMakeLists.txt
+++ b/PlugIns/FreeImageCodec/CMakeLists.txt
@@ -13,7 +13,7 @@ set(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreFreeImageCodec.cpp")
add_definitions(-DFREEIMAGE_LIB)
add_library(Codec_FreeImage ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCES})
-target_link_libraries(Codec_FreeImage PUBLIC OgreMain ${FreeImage_LIBRARIES})
+target_link_libraries(Codec_FreeImage PUBLIC OgreMain freeimage::FreeImage)
target_include_directories(Codec_FreeImage PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
$<INSTALL_INTERFACE:include/OGRE/Plugins/FreeImageCodec>