diff --git a/ogre-caelum/all/conandata.yml b/ogre-caelum/all/conandata.yml index 0d235fb..1a043c7 100644 --- a/ogre-caelum/all/conandata.yml +++ b/ogre-caelum/all/conandata.yml @@ -3,8 +3,8 @@ sources: url: "https://github.com/OGRECave/ogre-caelum/archive/94913d2040a41148c14001c33a0bdc0f100842f8.zip" sha256: "9de4159ae8050fd0858b3c1c09005aa50b36079a3a06accfb67203669be9a09e" "0.6.4": - url: "https://github.com/OGRECave/ogre-caelum/archive/115eecc6ff347d64aed289e4114fb9efc2a81cf6.zip" - sha256: "d218ed22fa9c32eabe217f59792894a8eb45d79757187d2293809aba5cf5b339" + url: "https://github.com/OGRECave/ogre-caelum/archive/7763bff99f758bbfcc5e7f9d751b2551e975545b.zip" + sha256: "069050b1039194324b0d1dddef887e83442b04d5843b4572ae5035da3e2d1ef6" patches: "0.6.3": - patch_file: "patches/0.6.3/CMakeLists.txt.patch" diff --git a/ogre-caelum/all/patches/0.6.4/CMakeLists.txt.patch b/ogre-caelum/all/patches/0.6.4/CMakeLists.txt.patch index 4c81111..5fa0956 100644 --- a/ogre-caelum/all/patches/0.6.4/CMakeLists.txt.patch +++ b/ogre-caelum/all/patches/0.6.4/CMakeLists.txt.patch @@ -1,11 +1,25 @@ --- CMakeLists.txt +++ CMakeLists.txt -@@ -7,7 +7,7 @@ - # cmake system for Caelum updated on 2-9-2021 by Edgar{at}AnotherFoxGuy{DOT}com +@@ -8,6 +8,8 @@ cmake_minimum_required(VERSION 3.0.2) --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) ++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/") \ No newline at end of file