Cmake findpackage linux fix
This commit is contained in:
parent
5764d27ef4
commit
c33ee14f36
@ -15,18 +15,6 @@ if(DEFINED ENV{MS_COMPATIBLE})
|
||||
endif()
|
||||
|
||||
|
||||
# Import needed packages and references their include path
|
||||
find_package(RSPModel 2.2 REQUIRED)
|
||||
include_directories(${RSPModel_INCLUDE_DIR})
|
||||
find_package(RSPTerrain 2.0 REQUIRED)
|
||||
include_directories(${RSPTerrain_INCLUDE_DIR})
|
||||
find_package(RSPTexture 2.1 REQUIRED)
|
||||
include_directories(${RSPTexture_INCLUDE_DIR})
|
||||
find_package(Boost 1.80.0 EXACT REQUIRED)
|
||||
include_directories(${Boost_INCLUDE_DIR})
|
||||
add_definitions(-DBOOST_ALL_NO_LIB)
|
||||
|
||||
|
||||
# Project definition
|
||||
if(DEFINED ENV{CI}) # Jenkins CI integration mode
|
||||
project(rdi VERSION $ENV{CI_VERSION}.$ENV{CI_BUILD_NUMBER} DESCRIPTION "Rogue Data Interface" LANGUAGES C CXX)
|
||||
@ -49,6 +37,17 @@ option(RDI_SHARED "Build shared lib" ON)
|
||||
option(RDI_STATIC "Build static lib" ON)
|
||||
option(BUILD_TOOLS "Build lib tools" ON)
|
||||
|
||||
# Import needed packages and references their include path
|
||||
find_package(RSPModel 2.2 REQUIRED)
|
||||
include_directories(${RSPModel_INCLUDE_DIR})
|
||||
find_package(RSPTerrain 2.0 REQUIRED)
|
||||
include_directories(${RSPTerrain_INCLUDE_DIR})
|
||||
find_package(RSPTexture 2.1 REQUIRED)
|
||||
include_directories(${RSPTexture_INCLUDE_DIR})
|
||||
find_package(Boost 1.80.0 EXACT REQUIRED)
|
||||
include_directories(${Boost_INCLUDE_DIR})
|
||||
add_definitions(-DBOOST_ALL_NO_LIB)
|
||||
|
||||
|
||||
# Push compile infos to source
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY)
|
||||
|
Loading…
x
Reference in New Issue
Block a user