try to compile mpi.mod even if the config was run previously

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c85854..d930151 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,8 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi)
       set(SMPI_FLANG 1)
     endif()
 
-    set(SMPI_FORTRAN 1)
+    set(SMPI_FORTRAN 1 CACHE BOOL "Whether SMPI Fortran code can be compiled")
+    mark_as_advanced(SMPI_FORTRAN)
   endif(CMAKE_Fortran_COMPILER)
 
 endif()
@@ -95,7 +96,7 @@ 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  "2018") # Year for copyright information
+set(SIMGRID_VERSION_DATE  "2019") # Year for copyright information
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@ -285,8 +286,6 @@ endif()
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
-
-set(HAVE_PTHREAD_SETAFFINITY 0)
 CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np  "" HAVE_PTHREAD_SETAFFINITY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -327,9 +326,9 @@ endif()
 CHECK_INCLUDE_FILE("sys/sendfile.h" HAVE_SENDFILE_H)
 CHECK_FUNCTION_EXISTS(sendfile HAVE_SENDFILE)
 if(HAVE_SENDFILE_H AND HAVE_SENDFILE)
-  set(HAVE_SENDFILE 1)
+  set(SG_HAVE_SENDFILE 1)
 else()
-  set(HAVE_SENDFILE 0)
+  set(SG_HAVE_SENDFILE 0)
 endif()
 
 if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD")
@@ -393,7 +392,6 @@ endif()
 if(enable_smpi)
   SET(HAVE_SMPI 1)
   if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux")
-    SET(USE_LIBUTIL 0)
     SET(HAVE_PRIVATIZATION 1)
   else()
     message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")
@@ -515,9 +513,11 @@ endif()
 #############################################
 
 # Avoid triggering a (full) rebuild by touching the files if they did not really change
-configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h.generated"    @ONLY IMMEDIATE)
-configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/config.h.in"          "${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated" @ONLY IMMEDIATE)
+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/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/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)
@@ -769,20 +769,24 @@ if(enable_java)
 endif()
 
 # Python binding, generated with pybind11
-set(PYBIND11_CPP_STANDARD -std=c++11)
 find_package(pybind11 2.2.0)
 if(NOT PYTHONLIBS_FOUND)
   set(pybind11_FOUND OFF)
 endif()
 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")
+  set(enable_python FALSE)
+endif()
+
 if(enable_python)
   if(pybind11_FOUND)
-    pybind11_add_module(simgrid_python src/bindings/python/simgrid_python.cpp)
-    set_source_files_properties(src/bindings/python/simgrid_python.cpp PROPERTIES COMPILE_FLAGS -std=c++14)
-    target_link_libraries(simgrid_python PUBLIC simgrid)
-    set_target_properties(simgrid_python PROPERTIES LIBRARY_OUTPUT_NAME simgrid)
-    set_property(TARGET simgrid_python
+    pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp)
+    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_property(TARGET python-bindings
                  APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
   else()
     message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).")
@@ -855,6 +859,7 @@ message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")
 if(${Java_FOUND})
   message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
   message("                version .............: ${Java_VERSION_STRING}")
+  message("                runtime .............: ${Java_JAVA_EXECUTABLE}")
 endif()
 if(CMAKE_Fortran_COMPILER)
   message("        Compiler: Fortran ...........: ${SMPI_Fortran_COMPILER} (id: ${CMAKE_Fortran_COMPILER_ID})")