deal with Boost 1.89 not having system as component anymore.
This commit is contained in:
@@ -93,11 +93,19 @@ endif ()
|
|||||||
set(ROOT_GRTEQ_24 ${ROOT_GRTEQ_24} CACHE INTERNAL "ROOT Version check")
|
set(ROOT_GRTEQ_24 ${ROOT_GRTEQ_24} CACHE INTERNAL "ROOT Version check")
|
||||||
|
|
||||||
#--- check for boost ----------------------------------------------------------
|
#--- check for boost ----------------------------------------------------------
|
||||||
|
find_package(Boost QUIET)
|
||||||
|
if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
|
||||||
|
find_package(Boost REQUIRED
|
||||||
|
COMPONENTS
|
||||||
|
filesystem
|
||||||
|
)
|
||||||
|
else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
|
||||||
find_package(Boost REQUIRED
|
find_package(Boost REQUIRED
|
||||||
COMPONENTS
|
COMPONENTS
|
||||||
system
|
system
|
||||||
filesystem
|
filesystem
|
||||||
)
|
)
|
||||||
|
endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
|
||||||
message(STATUS "Boost libs: ${Boost_LIBRARIES}")
|
message(STATUS "Boost libs: ${Boost_LIBRARIES}")
|
||||||
|
|
||||||
#--- check for gsl ------------------------------------------------------------
|
#--- check for gsl ------------------------------------------------------------
|
||||||
|
|||||||
8
src/external/Nonlocal/prog/CMakeLists.txt
vendored
8
src/external/Nonlocal/prog/CMakeLists.txt
vendored
@@ -22,11 +22,19 @@ if (ROOT_mathmore_FOUND)
|
|||||||
endif (ROOT_mathmore_FOUND)
|
endif (ROOT_mathmore_FOUND)
|
||||||
|
|
||||||
#--- check for boost ----------------------------------------------------------
|
#--- check for boost ----------------------------------------------------------
|
||||||
|
find_package(Boost QUIET)
|
||||||
|
if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
|
||||||
|
find_package(Boost REQUIRED
|
||||||
|
COMPONENTS
|
||||||
|
filesystem
|
||||||
|
)
|
||||||
|
else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
|
||||||
find_package(Boost REQUIRED
|
find_package(Boost REQUIRED
|
||||||
COMPONENTS
|
COMPONENTS
|
||||||
system
|
system
|
||||||
filesystem
|
filesystem
|
||||||
)
|
)
|
||||||
|
endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
|
||||||
message(STATUS "Boost libs: ${Boost_LIBRARIES}")
|
message(STATUS "Boost libs: ${Boost_LIBRARIES}")
|
||||||
|
|
||||||
#--- check for fftw3 ----------------------------------------------------------
|
#--- check for fftw3 ----------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user