From 287f519205308b07017ac147604f1a87d0b1a526 Mon Sep 17 00:00:00 2001 From: Matthew Barr Date: Thu, 16 Mar 2017 16:58:42 +1100 Subject: [PATCH] cmake: look for Boost in-tree first During development we tend to use a symlink to the most recent version of Boost from the Hyperscan source tree, so look there first. Also, unset some cached results so we recheck when the Boost version changes. --- CMakeLists.txt | 15 +++++++++------ cmake/boost.cmake | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fd3639f..0776e42c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,18 +72,21 @@ else () endif () set(BOOST_NO_BOOST_CMAKE ON) -# first check for Boost installed on the system -find_package(Boost ${BOOST_MINVERSION}) +unset(Boost_INCLUDE_DIR CACHE) +# we might have boost in tree, so provide a hint and try again +set(BOOST_INCLUDEDIR "${PROJECT_SOURCE_DIR}/include") +find_package(Boost ${BOOST_MINVERSION} QUIET) if(NOT Boost_FOUND) - # we might have boost in tree, so provide a hint and try again - message(STATUS "trying include dir for boost") - set(BOOST_INCLUDEDIR "${PROJECT_SOURCE_DIR}/include") - find_package(Boost ${BOOST_MINVERSION}) + # otherwise check for Boost installed on the system + unset(BOOST_INCLUDEDIR) + find_package(Boost ${BOOST_MINVERSION} QUIET) if(NOT Boost_FOUND) message(FATAL_ERROR "Boost ${BOOST_MINVERSION} or later not found. Either install system packages if available, extract Boost headers to ${CMAKE_SOURCE_DIR}/include, or set the CMake BOOST_ROOT variable.") endif() endif() +message(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") + include (${CMAKE_MODULE_PATH}/boost.cmake) # -- make this work? set(python_ADDITIONAL_VERSIONS 2.7 2.6) diff --git a/cmake/boost.cmake b/cmake/boost.cmake index 3d513deb..b7fda421 100644 --- a/cmake/boost.cmake +++ b/cmake/boost.cmake @@ -38,4 +38,7 @@ ${BOOST_REV_TEST}" BOOST_REVGRAPH_PATCH) endif() unset (CMAKE_REQUIRED_INCLUDES) +else () + unset(BOOST_REVGRAPH_OK CACHE) + unset(BOOST_REVGRAPH_PATCH CACHE) endif () # Boost 1.62.0