🐛 Fixed ogre 1.11 build with conan V2
This commit is contained in:
@ -1,20 +0,0 @@
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
cmake_minimum_required(VERSION 3.3.0)
|
||||
|
||||
+include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
|
||||
+
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
@@ -63,6 +65,7 @@
|
||||
|
||||
# Include necessary submodules
|
||||
set(CMAKE_MODULE_PATH
|
||||
+ "${CMAKE_BINARY_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/CMake"
|
||||
"${PROJECT_SOURCE_DIR}/CMake/Utils"
|
||||
"${PROJECT_SOURCE_DIR}/CMake/Packages"
|
||||
|
11
ogre/1.11/patches/1.11.6.1/FixFreeImage.patch
Normal file
11
ogre/1.11/patches/1.11.6.1/FixFreeImage.patch
Normal 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>
|
@ -1,11 +1,13 @@
|
||||
--- Components/Overlay/CMakeLists.txt
|
||||
+++ Components/Overlay/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@
|
||||
diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt
|
||||
index 1ed646080..3f0b75c33 100644
|
||||
--- a/Components/Overlay/CMakeLists.txt
|
||||
+++ b/Components/Overlay/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
|
||||
# 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_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB)
|
||||
target_include_directories(OgreOverlay PUBLIC
|
||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||
$<INSTALL_INTERFACE:include/OGRE/Overlay>
|
Reference in New Issue
Block a user