X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1826898309e6fdd09b8704fd598aa36037a46857..63a8fb284a051f3748a3eb0cdf73882a47c00c9d:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40d0e0bd4e..b2faaf2fca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ if(COMPILER_SUPPORTS_CXX11)
 else() 
   message(FATAL_ERROR 
           "The compiler ${CMAKE_CXX_COMPILER} (v${CMAKE_CXX_COMPILER_VERSION}) has no C++11 support. "
-           "Please use a decent C++ compiler.")
+          "Please install a decent C++ compiler (remove CMakeCache.txt once it's installed).")
 endif()
 
 ### And we need C11 standard, too
@@ -105,7 +105,7 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "17")
+set(SIMGRID_VERSION_MINOR "18")
 set(SIMGRID_VERSION_PATCH "0")
 set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
@@ -204,6 +204,8 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
   ENDIF()
   if (WIN32)
     message(STATUS "Disable fast raw contexts on Windows.")
+  elseif(enable_address_sanitizer)
+    message(STATUS "Disable fast raw contexts with ASan")
   else()
     set(HAVE_RAW_CONTEXTS 1)
   endif()
@@ -240,6 +242,7 @@ endif()
 if(WIN32)
   set(Boost_USE_STATIC_LIBS 1)
 endif()
+
 set(HAVE_PAPI 0)
 if(enable_smpi_papi)
   include(FindPAPI)
@@ -251,9 +254,9 @@ endif()
 # Not finding this is perfectly OK
 find_package(Boost COMPONENTS unit_test_framework)
 if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  message("--   (enabling the Boost-based unit tests)")
+  message(STATUS "Enabling the Boost-based unit tests.")
 else()
-  message("--   (disabling the Boost-based unit tests -- please install libboost-test-dev)")
+  message(STATUS "Disabling the Boost-based unit tests -- please install libboost-test-dev.")
 endif()
 
 
@@ -271,16 +274,8 @@ endif()
 find_package(Boost COMPONENTS context)
 set(Boost_FOUND 1) # This component is optional
 if(Boost_CONTEXT_FOUND)
-  if (Boost_VERSION LESS 105600)
-    message("Found Boost.Context API v1")
-    set(HAVE_BOOST_CONTEXTS 1)
-  elseif(Boost_VERSION LESS 106100)
-    message("Found Boost.Context API v2")
-    set(HAVE_BOOST_CONTEXTS 2)
-  else()
-    message("   WARNING : our implementation of Boost context factory is not compatible with Boost >=1.61 yet.")
-    set(HAVE_BOOST_CONTEXTS 0)
-  endif()
+  message(STATUS "Found Boost.Context")
+  set(HAVE_BOOST_CONTEXTS 1)
 else()
   message ("   boost        : found.")
   message ("   boost-context: missing. Install libboost-context-dev for this optional feature.")
@@ -570,15 +565,17 @@ if(CMAKE_USE_PTHREADS_INIT)
   endif()
 
   set(HAVE_THREAD_CONTEXTS 1)
-  message("-- Support for thread context factory ok.")
+  message(STATUS "Support for thread context factory ok.")
 endif()
 
 set(HAVE_UCONTEXT_CONTEXTS 0)
 if(NOT HAVE_UCONTEXT_H)
-  message("-- No ucontext factory: <ucontext.h> not found.")
+  message(STATUS "No ucontext factory: <ucontext.h> not found.")
 elseif(APPLE)
-  message("-- No ucontext factory: Apple don't want us to use them.")
+  message(STATUS "No ucontext factory: Apple don't want us to use them.")
   set(HAVE_UCONTEXT_H 0)
+elseif(enable_address_sanitizer)
+  message(STATUS "No ucontext factory: ASan does not support it (see http://code.google.com/p/address-sanitizer/issues/detail?id=189)")
 else()
   try_compile(compile_makecontext ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_makecontext.c
     OUTPUT_VARIABLE compile_makecontext_output)
@@ -586,10 +583,10 @@ else()
   #If can have both context
   if(compile_makecontext)
     set(HAVE_UCONTEXT_CONTEXTS 1)
-    message("-- Support for ucontext factory ok.")
+    message(STATUS "Support for ucontext factory ok.")
   else()
-    message("-- Error: <ucontext.h> exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}")
-    message("-- No ucontext factory: makecontext() is not compilable.")
+    message(STATUS "Error: <ucontext.h> exists, but makecontext is not compilable. Compilation output:\n ${compile_makecontext_output}")
+    message(STATUS "No ucontext factory: makecontext() is not compilable.")
   endif()
 
   # Stack setup (size and address)
@@ -679,6 +676,11 @@ else()
   set(GIT_VERSION "none, release version")
 endif()
 
+### Setup gcc & clang flags
+if (NOT MSVC)
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake)
+endif()
+
 ### Generate the required headers and scripts
 #############################################
 
@@ -870,11 +872,6 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
 
-### Setup gcc & clang flags
-if (NOT MSVC)
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake)
-endif()
-
 ### Make Libs
 if(NOT WIN32)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake)