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

🔨 Use find_package instead of cmake_paths

Browse Source
This commit is contained in:
Edgar
2021-09-03 11:09:20 +00:00
committed by GitHub
parent b08b2caabe
commit 3a4d4f50bb
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ogre-pagedgeometry/all/patches/1.2.1/CMakeLists.txt.patch
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 PagedGeometry 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)
@@ -20,7 +21,7 @@
@@ -20,7 +20,7 @@
# some versioning things
SET(LIB_MAJOR_VERSION "1")
SET(LIB_MINOR_VERSION "2")
@ -16,4 +17,4 @@
+SET(LIB_BUILD_VERSION "1")
SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_BUILD_VERSION}")
IF(NOT DEFINED LIB_INSTALL_DIR)
SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")