kill exception example

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2d2eb4..fa02471 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,6 @@ include(CheckSymbolExists)
 
 set(HAVE_GRAPHVIZ 0)
 include(FindGraphviz)
-include(FindLibSigc++)
 
 set(HAVE_LUA 0)
 if(enable_lua)
@@ -239,7 +238,8 @@ else()
   else()
     message(FATAL_ERROR "Failed to find Boost libraries."
                         "Did you install libboost-dev and libboost-context-dev?"
-                        "(libboost-context-dev is optional)")
+                        "(libboost-context-dev is optional)"
+                        "SimGrid requires Boost >= 1.48.0")
   endif()
 endif()
 
@@ -262,6 +262,18 @@ else()
   set(HAVE_BOOST_CONTEXTS 0)
 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_GRAPH_FOUND)
+  set(HAVE_BOOST_GRAPH 1)
+else()
+  message ("   boost        : found.")
+  message ("   boost-graph  : missing. Install libboost-graph-dev for this optional feature.")
+  set(HAVE_BOOST_GRAPH 0)
+endif()
+
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(execinfo backtrace              "" HAVE_BACKTRACE_IN_LIBEXECINFO)
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
@@ -962,7 +974,6 @@ message("        Documentation................: ${enable_documentation}")
 message("        Model checking ..............: ${HAVE_MC}")
 message("        Jedule  mode ................: ${HAVE_JEDULE}")
 message("        Graphviz mode ...............: ${HAVE_GRAPHVIZ}")
-message("        Sigc++ mode .................: ${SIMGRID_HAVE_LIBSIG}")
 message("        Mallocators .................: ${enable_mallocators}")
 message("")
 message("        Simgrid dependencies ........: ${SIMGRID_DEP}")