search separately for required boost and optional boost-context

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 3237bad..1a74815 100644 (file)
--- 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")
+    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()
 
@@ -549,15 +552,15 @@ elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
 endif()
 
 if(release)
-  set(SIMGRID_VERSION_STRING "${SIMGRID_VERSION_STRING}\\nRelease build")
+  set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER}\\nRelease build")
 else()
-  set(SIMGRID_VERSION_STRING "${SIMGRID_VERSION_STRING}\\nDevelopment build")
+  set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER}\\nDevelopment build")
 endif()
 if(GIT_VERSION)
-  set(SIMGRID_VERSION_STRING "${SIMGRID_VERSION_STRING} at commit ${GIT_VERSION}")
+  set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER} at commit ${GIT_VERSION}")
 endif()
 if(GIT_DATE)
-  set(SIMGRID_VERSION_STRING "${SIMGRID_VERSION_STRING} (${GIT_DATE})")
+  set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER} (${GIT_DATE})")
 endif()
 #--------------------------------------------------------------------------------------------------