Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Deprecate e_smx_state_t.
[simgrid.git] / CMakeLists.txt
index be9a190..e118fcf 100644 (file)
@@ -1,18 +1,38 @@
+# Build the version number
+
+set(SIMGRID_VERSION_MAJOR "3")
+set(SIMGRID_VERSION_MINOR "25")
+set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
+
+if(${SIMGRID_VERSION_PATCH} EQUAL "0")
+  set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
+else()
+  set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
+endif()
+
+message(STATUS "Configuring SimGrid v${release_version}")
+
+set(SIMGRID_VERSION_STRING "SimGrid version ${release_version}")
+
+set(libsimgrid_version "${release_version}")
+set(libsimgrid-java_version "${release_version}")
+
+# Basic checks on cmake
 cmake_minimum_required(VERSION 3.5)
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules)
 
 project(SimGrid C CXX)
 
+## Save compiler flags preset with environment variables CFLAGS or CXXFLAGS;
+## they will used within smpicc, smpicxx.
+## Do it early so that we get their genuine values. The same will be done later for Fortran.
+string(REGEX REPLACE " *-f[a-z]+-prefix-map=[^ ]*" "" SMPI_C_FLAGS "${CMAKE_C_FLAGS}")
+string(REGEX REPLACE " *-f[a-z]+-prefix-map=[^ ]*" "" SMPI_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 #     Check for the compiler        #
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-
-### Need to set rc ccompiler before enable language
-if(WIN32)
-  SET(CMAKE_RC_COMPILER "windres")
-endif()
-
 ## 
 ## Check the C/C++ standard that we need
 ##   See also tools/cmake/Flags.cmake that sets our paranoid warning flags
@@ -22,7 +42,6 @@ CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER)
 ## Request full debugging flags
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
 
 if (CMAKE_COMPILER_IS_GNUCC)    
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
@@ -80,34 +99,16 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi)
       set(SMPI_Fortran_LIBS "")
       set(SMPI_FLANG 1)
     endif()
+    string(REGEX REPLACE " *-f[a-z]+-prefix-map=[^ ]*" "" SMPI_Fortran_FLAGS "${SMPI_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS}")
+
+    ## Request debugging flags for Fortran too
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
 
     set(SMPI_FORTRAN 1)
   endif(CMAKE_Fortran_COMPILER)
 
 endif()
 
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-#     Build the version number      #
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-
-set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "21")
-set(SIMGRID_VERSION_PATCH "90")
-set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
-
-set(SIMGRID_VERSION_DATE  "2019") # Year for copyright information
-
-if(${SIMGRID_VERSION_PATCH} EQUAL "0")
-  set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
-else()
-  set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
-endif()
-
-set(SIMGRID_VERSION_STRING "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}")
-
-set(libsimgrid_version "${release_version}")
-set(libsimgrid-java_version "${release_version}")
-
 ### SET THE LIBRARY EXTENSION 
 if(APPLE)
   set(LIB_EXE "dylib")
@@ -205,11 +206,14 @@ include(CheckLibraryExists)
 include(CheckSymbolExists)
 
 set(HAVE_GRAPHVIZ 0)
-include(FindGraphviz)
-
 set(SIMGRID_HAVE_LUA 0)
-if(enable_lua)
-  include(FindLuaSimgrid)
+if(minimal-bindings)
+  message(STATUS "Don't even look for graphviz nor lua, as we build minimal binding libraries.")
+else()
+  include(FindGraphviz)
+  if(enable_lua)
+    include(FindLuaSimgrid)
+  endif()
 endif()
 
 set(SIMGRID_HAVE_NS3 0)
@@ -221,10 +225,15 @@ if(enable_ns3)
       set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
     endforeach()
   else()
-    message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
+    message(FATAL_ERROR "Cannot find ns-3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
   endif()
 endif()
 
+set(SIMGRID_HAVE_MSG 0)
+if(enable_msg)
+  set(SIMGRID_HAVE_MSG 1)
+endif()
+
 if(WIN32)
   set(Boost_USE_STATIC_LIBS 1)
 endif()
@@ -238,55 +247,65 @@ if(enable_smpi_papi)
 endif()
 
 # But we do need the core of Boost
-find_package(Boost 1.48)
-if(Boost_FOUND)
-  include_directories(${Boost_INCLUDE_DIRS})
-else()
-  if(APPLE)
-    message(FATAL_ERROR "Boost libraries not found. Try to install them with 'sudo fink install boost1.53.nopython' (check the exact name with 'fink list boost') or 'sudo brew install boost'")
-  else()
-    message(FATAL_ERROR "Boost libraries not found. Install libboost-dev (>= 1.48.0).")
-  endif()
-endif()
-
 # cmake before 3.13.1 does not know about stacktrace components. Fix it.
 # Usable components: https://www.boost.org/doc/libs/1_65_1/doc/html/stacktrace/configuration_and_build.html
 set(_Boost_STACKTRACE_HEADERS           "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
+set(_Boost_STACKTRACE_ADDR2LINE_HEADERS "boost/stacktrace.hpp")
 
-find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace unit_test_framework)
-set(Boost_FOUND 1) # These components are optionals
-message(STATUS "Mandatory components found. SimGrid is compilable.")
-message(STATUS "Looking for optional Boost components:")
-
-if (Boost_STACKTRACE_BACKTRACE_FOUND)
-  message (STATUS "  stacktrace: found. Activating human-readable stack traces.")
-  set(HAVE_BOOST_STACKTRACE 1)
-  set(SIMGRID_DEP "${SIMGRID_DEP} -lboost_stacktrace_backtrace")
-else()
-  message (STATUS "  stacktrace: MISSING. Install libboost-stacktrace-dev to display the stacktraces.")
-  set(HAVE_BOOST_STACKTRACE 0)
-endif()
-
-if(Boost_CONTEXT_FOUND)
-  message (STATUS "  context: found. Activating Boost contexts.")
-  set(HAVE_BOOST_CONTEXTS 1)
-else()
-  message (STATUS "  context: MISSING. Install libboost-context-dev for this optional feature.")
-  set(HAVE_BOOST_CONTEXTS 0)
-endif()
-
-if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  message(STATUS  "  unit_test_framework: found. Activating the Boost-based unit tests.")
-else()
-  message(STATUS  "  unit_test_framework: MISSING. Install libboost-test-dev (>= v1.59) to activate the Unit Tests.")
-endif()
-
+  if(minimal-bindings) # When we want a minimal jarfile, don't even search for boost optional components
+    message(STATUS "Don't even look for boost optional components, as we build minimal binding libraries.")
+    find_package(Boost 1.48)
+  else()
+    find_package(Boost 1.59 OPTIONAL_COMPONENTS context stacktrace_backtrace stacktrace_addr2line)
+  endif()
+  if(Boost_FOUND)
+    include_directories(${Boost_INCLUDE_DIRS})
+    message(STATUS "Mandatory components found. SimGrid is compilable.")
+    if (NOT minimal-bindings)
+      message(STATUS "Looking for optional Boost components:")
+      set(Boost_FOUND 1) # These components are optionals
+      CHECK_INCLUDE_FILE("backtrace.h" HAVE_BACKTRACE_H) # check that backtrace is actually possible
+      if (Boost_STACKTRACE_BACKTRACE_FOUND AND HAVE_BACKTRACE_H)
+        message (STATUS "  stacktrace: found the fast 'backtrace' implementation. Activating human-readable stack traces.")
+        set(HAVE_BOOST_STACKTRACE_BACKTRACE 1)
+      else()
+        set(HAVE_BOOST_STACKTRACE_BACKTRACE 0)
+        if (Boost_STACKTRACE_ADDR2LINE_FOUND)
+          message (STATUS "  stacktrace: found the slow 'addr2line' implementation. Activating human-readable stack traces.")
+          set(HAVE_BOOST_STACKTRACE_ADDR2LINE 1)
+        else()
+          message (STATUS "  stacktrace: MISSING. Install libboost-stacktrace-dev to display the stacktraces.")
+          set(HAVE_BOOST_STACKTRACE_ADDR2LINE 0)
+        endif()
+      endif()
+
+      if(Boost_CONTEXT_FOUND)
+        message (STATUS "  context: found. Activating Boost contexts.")
+        set(HAVE_BOOST_CONTEXTS 1)
+      else()
+        message (STATUS "  context: MISSING. Install libboost-context-dev for this optional feature.")
+        set(HAVE_BOOST_CONTEXTS 0)
+      endif()
+    endif()
+  else()
+    if(APPLE)
+      message(FATAL_ERROR "Boost libraries not found. Try to install them with 'sudo fink install boost1.53.nopython' (check the exact name with 'fink list boost') or 'sudo brew install boost'")
+    else()
+      find_package(Boost 1.48) #try without optional libraries
+      if(NOT Boost_FOUND)
+        message(FATAL_ERROR "Boost libraries not found. Install libboost-dev (>= 1.48.0).")
+      else()
+        include_directories(${Boost_INCLUDE_DIRS})
+        message(STATUS "Mandatory components found. SimGrid is compilable.")
+      endif()
+    endif()
+  endif() 
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
 CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np  "" HAVE_PTHREAD_SETAFFINITY)
-CHECK_INCLUDE_FILE("pthread_np" HAVE_PTHREAD_NP_H) # for pthread_setaffinity_np() on FreeBSD
+CHECK_INCLUDE_FILE("pthread_np.h" HAVE_PTHREAD_NP_H) # for pthread_setaffinity_np() on FreeBSD
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_REQUIRED_DEFINITIONS "-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
@@ -303,7 +322,6 @@ CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
-CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
 CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H)
 
 CHECK_FUNCTION_EXISTS(dlfunc HAVE_DLFUNC)
@@ -358,12 +376,19 @@ else()
   SET(SIMGRID_HAVE_MALLOCATOR 0)
 endif()
 
-include(FindLibunwind)
-if(HAVE_LIBUNWIND)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES}")
-else()
+if (minimal-bindings)
+  message(STATUS "Don't look for libunwind as we build minimal binding libraries.")
   if(enable_model-checking)
-    message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.")
+    message(FATAL_ERROR "You cannot enable model-checking and minimal-bindings at the same time.")
+  endif()
+else()
+  include(FindLibunwind)
+  if(HAVE_LIBUNWIND)
+    SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES}")
+  else()
+    if(enable_model-checking)
+      message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.")
+    endif()
   endif()
 endif()
 
@@ -375,7 +400,7 @@ if(enable_model-checking)
   set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}")
   set(SIMGRID_HAVE_MC 1)
   if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_java)
-    message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling java")
+    message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling the Java bindings.")
     set(enable_java FALSE)
   endif()
 else()
@@ -385,17 +410,23 @@ endif()
 mark_as_advanced(PATH_LIBDW_H)
 mark_as_advanced(PATH_LIBDW_LIB)
 
+if(enable_java AND NOT enable_msg)
+  message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_msg=ON or -Denable_java=OFF")
+endif()
+
 if (enable_model-checking AND enable_ns3)
-  message(FATAL_ERROR "Cannot activate both model-checking and NS3 bindings: NS3 pull too much dependencies for the MC to work")
+  message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pulls too much dependencies for the MC to work")
 endif()
 
+get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+
 if(enable_smpi)
   SET(HAVE_SMPI 1)
-  if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux")
-    SET(HAVE_PRIVATIZATION 1)
-  else()
-    message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")
+  if(WIN32)
+    message (STATUS "Warning: no support for SMPI automatic privatization on Windows.")
     SET(HAVE_PRIVATIZATION 0)
+  else()
+    SET(HAVE_PRIVATIZATION 1)
   endif()
 else()
   SET(HAVE_SMPI 0)
@@ -405,6 +436,7 @@ endif()
 ### Check what context backends are available
 
 set(HAVE_UCONTEXT_CONTEXTS 0)
+CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
 if(NOT HAVE_UCONTEXT_H)
   message(STATUS "No ucontext factory: <ucontext.h> not found.")
 elseif(APPLE)
@@ -467,44 +499,28 @@ file(REMOVE test_stackgrowth)
 ## GIT version check
 ##
 if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
-  execute_process(
-     COMMAND git remote
-     COMMAND head -n 1
-     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-     OUTPUT_VARIABLE remote
+  execute_process(COMMAND git rev-parse --verify --short HEAD
+     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+     OUTPUT_VARIABLE GIT_VERSION
      OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #message(STATUS "Git remote: ${remote}")
-  execute_process(COMMAND git config --get remote.${remote}.url
-     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-     OUTPUT_VARIABLE url
-     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #message(STATUS "Git url: ${url}")
-  if(url)
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=oneline --abbrev-commit -1
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-       OUTPUT_VARIABLE GIT_VERSION
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "Git version: ${GIT_VERSION}")
-
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --pretty=format:%ai .
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-       OUTPUT_VARIABLE GIT_DATE 
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "Git date: ${GIT_DATE}")
-    string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=format:%H -1
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
-       OUTPUT_VARIABLE SIMGRID_GITHASH
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # Check for uncommitted changes
+  execute_process(COMMAND git diff --name-only HEAD
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+    OUTPUT_VARIABLE files_changed)
+  if(files_changed)
+    set(GIT_VERSION "${GIT_VERSION}-dirty")
   endif()
 elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
   FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION)
 else()
   set(GIT_VERSION "none, release version")
 endif()
+message(STATUS "Git version: ${GIT_VERSION}")
+
+### Define source packages for Libs
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
 
-### Setup gcc & clang flags
+### Setup gcc & clang flags (include after DefinePackage.cmake, and before generating header files)
 if (NOT MSVC)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
 endif()
@@ -514,13 +530,14 @@ endif()
 
 # Avoid triggering a (full) rebuild by touching the files if they did not really change
 configure_file("${CMAKE_HOME_DIRECTORY}/src/internal_config.h.in"    "${CMAKE_BINARY_DIR}/src/internal_config.h.generated"    @ONLY IMMEDIATE)
-configure_file("${CMAKE_HOME_DIRECTORY}/src/simgrid/version.h.in"    "${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/version.h.in" "${CMAKE_BINARY_DIR}/include/simgrid/version.h.generated" @ONLY IMMEDIATE)
 configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated" @ONLY IMMEDIATE)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/internal_config.h.generated ${CMAKE_BINARY_DIR}/src/internal_config.h)
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated ${CMAKE_BINARY_DIR}/src/simgrid/version.h)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/version.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/version.h)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/config.h)
 file(REMOVE ${CMAKE_BINARY_DIR}/src/internal_config.h.generated)
 file(REMOVE ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated)
+file(REMOVE ${CMAKE_BINARY_DIR}/include/simgrid/version.h.generated)
 
 # We need two versions of the SMPI scripts because they contain the path to the library
 # so, it depends of whether SimGrid is installed, or run from the sources (during the build)
@@ -536,7 +553,7 @@ set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${CMAKE_INSTALL_PREFIX}/lib")
 if(NS3_LIBRARY_PATH)
   set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}")
 endif()
-set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
+set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
 set(SMPIMAIN ${libdir}/simgrid/smpimain)
 set(SMPIREPLAYMAIN ${libdir}/simgrid/smpireplaymain)
 
@@ -565,7 +582,7 @@ set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${CMAKE_BINARY_DIR}/lib")
 if(NS3_LIBRARY_PATH)
   set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}")
 endif()
-set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
+set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
 set(SMPIMAIN ${CMAKE_BINARY_DIR}/lib/simgrid/smpimain)
 set(SMPIREPLAYMAIN ${CMAKE_BINARY_DIR}/lib/simgrid/smpireplaymain)
 
@@ -583,6 +600,7 @@ endif()
 set(generated_headers_to_install
   ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/mpif.h
   ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid/config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid/version.h
   )
 
 set(generated_headers  ${CMAKE_CURRENT_BINARY_DIR}/src/internal_config.h )
@@ -750,14 +768,10 @@ endif()
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
   "${generated_files_to_clean}")
 
-### Define source packages for Libs
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
-
 add_custom_target(tests COMMENT "Recompiling the tests")
 
 ### Build some Maintainer files
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
 
 ### Make Libs
 if(NOT WIN32)
@@ -770,36 +784,70 @@ if(enable_java)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Java.cmake)
 endif()
 
+if (enable_model-checking AND (NOT ("cxx_std_14" IN_LIST known_features)))
+  message(WARNING "C++14 not found. The model-checker will use a slow hash function. You should upgrade your compiler")
+  set(SG_HAVE_CPP14 0)
+else()
+  set(SG_HAVE_CPP14 1)
+  set_property(TARGET simgrid PROPERTY CXX_STANDARD 14)    
+endif()
+
 # Python binding (with pybind11)
 ################
-
 # Our usage of pybind11::overload_cast mandates C++14
-get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-if ("cxx_std_14" IN_LIST known_features)
-  find_package(pybind11 2.2.0)
-  if(NOT PYTHONLIBS_FOUND)
+if((NOT DEFINED enable_python) OR enable_python)
+  if("cxx_std_14" IN_LIST known_features)
+
+    if(EXISTS ${CMAKE_HOME_DIRECTORY}/pybind11) # Try to use a local copy of pybind11, if any
+      message(STATUS "Use the internal copy of pybind11 (using C++14).")
+      add_subdirectory(${CMAKE_HOME_DIRECTORY}/pybind11)
+      set(pybind11_FOUND ON)
+
+      set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/pybind11/tools/)
+      set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+      find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
+
+    else()
+      find_package(pybind11 CONFIG)
+      message(STATUS "Pybind11 version: ${pybind11_VERSION}")
+      if (pybind11_VERSION VERSION_LESS 2.4)
+        message(STATUS "SimGrid needs at least v2.4 of pybind11. Disabling the Python bindings.")
+        set(pybind11_FOUND OFF)
+      endif()
+    endif()
+
+    if(NOT PYTHONLIBS_FOUND)
+      message(STATUS "Python libs not found. Turn pybind11 off.")
+
+      set(pybind11_FOUND OFF)
+    endif()
+
+  else()
+    message(STATUS "No support for C++14 detected, don't even search for pybind11.")
     set(pybind11_FOUND OFF)
   endif()
-else()
-  message(STATUS "No support for C++14 detected, don't even search for pybind11.")
-  set(pybind11_FOUND OFF)
+  unset(known_features)
 endif()
-unset(known_features)
 
 option(enable_python "Whether the Python bindings are activated." ${pybind11_FOUND}) # ON by default if dependencies are met
 
 if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_model-checking AND enable_python)
-  message(WARNING "FreeBSD + Model-Checking + Python = too much for now. Disabling python.")
+  message(WARNING "FreeBSD + Model-Checking + Python = too much for now. Disabling the Python bindings.")
   set(enable_python FALSE)
 endif()
 
 if(enable_python)
   if(pybind11_FOUND)
     message(STATUS "Found pybind11, with C++14.")
-    pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp)
+    if(NOT enable_lto)
+      set(pybind11_options NO_EXTRAS)
+    endif()
+    pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp ${pybind11_options})
     target_compile_features(python-bindings PRIVATE cxx_std_14)
     target_link_libraries(python-bindings PUBLIC simgrid)
-    set_target_properties(python-bindings PROPERTIES LIBRARY_OUTPUT_NAME simgrid)
+    set_target_properties(python-bindings PROPERTIES
+                          LIBRARY_OUTPUT_NAME simgrid
+                          CXX_VISIBILITY_PRESET "default")
     add_dependencies(tests python-bindings)
     set_property(TARGET python-bindings
                  APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
@@ -860,11 +908,7 @@ message("        Build Name ..................: ${BUILDNAME}")
 message("        Cmake Generator .............: ${CMAKE_GENERATOR}")
 message("        Site ........................: ${SITE}")
 message("        Install prefix ..............: ${CMAKE_INSTALL_PREFIX}")
-if(release)
-  message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (release build)")
-else()
-  message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (development build)")
-endif()
+message("        Release .....................: simgrid-${release_version}")
 message("")
 message("        Compiler: C .................: ${CMAKE_C_COMPILER} (id: ${CMAKE_C_COMPILER_ID})")
 message("                version .............: ${CMAKE_C_COMPILER_VERSION}")
@@ -890,23 +934,29 @@ message("        LDFlags .....................: ${CMAKE_C_LINK_FLAGS}")
 message("        with LTO ....................: ${enable_lto}")
 message("")
 
+if (SIMGRID_HAVE_MSG)
+  message("        Compile MSG .................: ON")
+else()
+  message("        Compile MSG .................: OFF")
+endif()
+
 if (SIMGRID_HAVE_NS3)
-  message("        Compile NS-3 ................: yes (path: ${NS3_PATH})")
+  message("        Compile ns-3 ................: ON (path: ${NS3_PATH})")
 else()
-  message("        Compile NS-3 ................: NO  (hint: ${NS3_HINT})")
+  message("        Compile ns-3 ................: OFF  (hint: ${NS3_HINT})")
 endif()
 
 if (${Java_FOUND})
-  message("        Compile Java ................: yes")
+  message("        Compile Java ................: ON")
   message("          Native lib in jar .........: ${enable_lib_in_jar}")
 else()
-  message("        Compile Java ................: NO")
+  message("        Compile Java ................: OFF")
 endif()
 if(pybind11_FOUND)
   message("        Compile Python bindings .....: ${enable_python}")
   message("          module ....................: ${PYTHON_MODULE_PREFIX}simgrid${PYTHON_MODULE_EXTENSION}")
 else()
-  message("        Compile Python bindings .....: NO (disabled, or pybind11 not found)")
+  message("        Compile Python bindings .....: OFF (disabled, or pybind11 not found)")
 endif()
 message("        Compile Lua .................: ${SIMGRID_HAVE_LUA}")
 message("        Compile Smpi ................: ${HAVE_SMPI}")