X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f6a71a271e4625c51f4949eb5919ee9f94641531..e59b26851e3ef00718eda1b926fe6ae8b3bb074e:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 193567c5d2..e118fcfa4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,9 @@
 # Build the version number
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "24")
+set(SIMGRID_VERSION_MINOR "25")
 set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
 
-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()
@@ -29,8 +27,8 @@ 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.
-set(SMPI_C_FLAGS "${CMAKE_C_FLAGS}")
-set(SMPI_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+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        #
@@ -101,7 +99,7 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi)
       set(SMPI_Fortran_LIBS "")
       set(SMPI_FLANG 1)
     endif()
-    set(SMPI_Fortran_FLAGS "${SMPI_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS}")
+    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")
@@ -231,6 +229,11 @@ if(enable_ns3)
   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()
@@ -319,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)
@@ -408,19 +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 ns-3 bindings: ns-3 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(NOT WIN32)
-    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)
@@ -430,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)
@@ -593,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 )
@@ -801,8 +809,9 @@ if((NOT DEFINED enable_python) OR enable_python)
 
     else()
       find_package(pybind11 CONFIG)
-      if (pybind11_VERSION VERSION_LESS 2.2)
-        message(STATUS "SimGrid needs at least v2.2 of pybind11. Disabling the Python bindings (found version: ${pybind11_VERSION}).")
+      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()
@@ -925,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}")