Try to improve valgrind suppressions for python before the night.

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5356565..c374955 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,15 +375,9 @@ if(enable_model-checking)
   include_directories(${LIBDW_INCLUDE_DIR} ${LIBELF_INCLUDE_DIR} ${LIBEVENT_INCLUDE_DIR})
   set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}")
   set(SIMGRID_HAVE_MC 1)
-  if("${CMAKE_SYSTEM}" MATCHES "FreeBSD")
-    if (enable_java)
-      message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling java")
-      set(enable_java FALSE)
-    endif()
-    if (enable_python)
-      message(WARNING "FreeBSD + Model-Checking + Python = too much for now. Disabling python")
-      set(enable_python FALSE)
-    endif()
+  if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_java)
+    message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling java")
+    set(enable_java FALSE)
   endif()
 else()
   SET(SIMGRID_HAVE_MC 0)  
@@ -782,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)
@@ -861,6 +860,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})")