🔨 Use find_package instead of cmake_paths

This commit is contained in:
2021-09-03 11:09:20 +00:00
committed by GitHub
parent b08b2caabe
commit 3a4d4f50bb
4 changed files with 30 additions and 19 deletions

View File

@ -1,14 +1,15 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -9,6 +9,7 @@
cmake_minimum_required(VERSION 3.0.2)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
@@ -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)
+include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
# add some functions we use that are shipped with cmake
INCLUDE(CheckLibraryExists)
@@ -18,7 +19,7 @@
@@ -18,7 +18,7 @@
INCLUDE(CheckCSourceCompiles)
# define the project
@ -16,4 +17,13 @@
+project(Caelum VERSION 0.6.4)
# some versioning things
SET(LIB_MAJOR_VERSION ${Caelum_VERSION_MAJOR})
SET(LIB_MAJOR_VERSION ${Caelum_VERSION_MAJOR})
@@ -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