From: Marc Fehling Date: Thu, 7 Jun 2018 03:37:06 +0000 (-0600) Subject: Cleanup of FindBOOST.cmake X-Git-Tag: v9.1.0-rc1~1036^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c000baaed4e2175de3580cca31080cb3622224b7;p=dealii.git Cleanup of FindBOOST.cmake --- diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake index 068d70ed42..78b4943d6d 100644 --- a/cmake/modules/FindBOOST.cmake +++ b/cmake/modules/FindBOOST.cmake @@ -26,9 +26,13 @@ # BOOST_VERSION_MINOR # BOOST_VERSION_SUBMINOR # -# We require at least boost 1.59 since boost::container::small_vector was -# introduced in 1.58 and some serialization bugs in 1.58 were not fixed until -# 1.59. + +# +# We require at least boost 1.59. +# - Boost::container::small_vector was introduced in 1.58 and some +# serialization bugs in 1.58 were not fixed until 1.59. +# +SET(BOOST_VERSION_REQUIRED 1.59) SET(BOOST_DIR "" CACHE PATH "An optional hint to a BOOST installation") SET_IF_EMPTY(BOOST_DIR "$ENV{BOOST_DIR}") @@ -47,11 +51,11 @@ ENDIF() # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) IF(DEAL_II_WITH_ZLIB) - FIND_PACKAGE(Boost 1.59 COMPONENTS + FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS iostreams serialization system thread ) ELSE() - FIND_PACKAGE(Boost 1.59 COMPONENTS + FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS serialization system thread ) ENDIF() @@ -66,9 +70,9 @@ IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS) # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) IF(DEAL_II_WITH_ZLIB) - FIND_PACKAGE(Boost 1.59 COMPONENTS iostreams serialization system thread) + FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS iostreams serialization system thread) ELSE() - FIND_PACKAGE(Boost 1.59 COMPONENTS serialization system thread) + FIND_PACKAGE(Boost ${BOOST_VERSION_REQUIRED} COMPONENTS serialization system thread) ENDIF() LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) ENDIF()