From 4ee799f96f81829cb69a294de77e480b1200a2a4 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 24 Jul 2015 23:59:11 +0200 Subject: [PATCH 1/1] search separately for required boost and optional boost-context --- buildtools/Cmake/CompleteInFiles.cmake | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 9fad3e0146..1a748154fb 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -111,22 +111,23 @@ if(enable_ns3) endif() endif() -# algorithm 1.50.0 -# function 1.23.0 -# intrusive 1.35.0 -# lambda 1.28.0 -# signals2 1.39.0 -find_package(Boost 1.42 COMPONENTS context) +find_package(Boost 1.42) if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIRS}) else() - if(APPLE) #MAC + if(APPLE) message(FATAL_ERROR "Failed to find Boost libraries (Try to install them with 'sudo fink install boost1.53.nopython')") else() - message(FATAL_ERROR "Failed to find Boost libraries. Did you install libboost-dev and libboost-context-dev?") + message(FATAL_ERROR "Failed to find Boost libraries." + "Did you install libboost-dev and libboost-context-dev?" + "(libboost-context-dev is optional)") endif() endif() +# Try again to see if we have libboost-context +find_package(Boost 1.42 COMPONENTS context) +set(Boost_FOUND 1) # We don't care of whether this component is missing + if(Boost_FOUND AND Boost_CONTEXT_FOUND) # We should use feature detection for this instead: if (Boost_VERSION LESS 105600) @@ -137,6 +138,8 @@ if(Boost_FOUND AND Boost_CONTEXT_FOUND) set(HAVE_BOOST_CONTEXT 2) endif() else() + message (" boost : found.") + message (" boost-context: missing. Install libboost-context-dev for this optional feature.") set(HAVE_BOOST_CONTEXT 0) endif() -- 2.20.1