🐛 Fixed caelum patch

This commit is contained in:
2022-11-14 18:17:03 +01:00
parent da749af80e
commit 7026ce1c40
4 changed files with 23 additions and 55 deletions

View File

@ -1,20 +0,0 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -7,7 +7,7 @@
# cmake system for Caelum updated on 6-10-2017 by Edgar{at}AnotherFoxGuy{DOT}com
cmake_minimum_required(VERSION 3.0.2)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake)
# add some functions we use that are shipped with cmake
@@ -34,7 +34,7 @@
SET(CMAKE_USE_RELATIVE_PATHS OFF)
-find_package(OGRE REQUIRED CONFIG)
+find_package(OGRE REQUIRED)
link_directories(${OGRE_LIBRARY_DIRS})
# setup paths

View File

@ -1,25 +1,8 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -8,6 +8,8 @@
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -34,4 +34,4 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/main/include/ DESTINATION ${CMAKE_INSTALL_
install(DIRECTORY ${CMAKE_BINARY_DIR}/main/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Caelum FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
cmake_minimum_required(VERSION 3.0.2)
+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH})
+set(CMAKE_DEBUG_POSTFIX _d)
# define the project
project(
Caelum
@@ -29,7 +31,12 @@
SET(CMAKE_USE_RELATIVE_PATHS OFF)
-find_package(OGRE REQUIRED CONFIG)
+find_package(OGRE REQUIRED)
+
+add_library(OgreMain INTERFACE IMPORTED GLOBAL)
+target_include_directories(OgreMain INTERFACE ${OGRE_INCLUDE_DIRS})
+target_link_libraries(OgreMain INTERFACE ${OGRE_LIBRARIES})
+
# setup paths
SET(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
# --- Ogre 3D graphics engine ---
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC OgreMain)
+target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC OGRE::OGRE)