[travis] Try to not explicitely ask for default-jdk.

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aeee46..85d9903 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,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}")
@@ -327,9 +327,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")
@@ -515,8 +515,8 @@ 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}/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}/include/simgrid/config.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/config.h)
 file(REMOVE ${CMAKE_BINARY_DIR}/src/internal_config.h.generated)
@@ -776,6 +776,11 @@ if(NOT PYTHONLIBS_FOUND)
 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(python-bindings src/bindings/python/simgrid_python.cpp)