cmake: do not build the documentation by default

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1af2402..12d1189 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,8 +92,8 @@ endif()
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "22")
-set(SIMGRID_VERSION_PATCH "1")
-#set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+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
 
@@ -358,6 +358,9 @@ endif()
 
 if (minimal_java)
   message(STATUS "Don't look for libunwind as we build a minimal jar file.")
+  if(enable_model-checking)
+    message(FATAL_ERROR "You cannot enable model-checking and minimal_java at the same time.")
+  endif()
 else()
   include(FindLibunwind)
   if(HAVE_LIBUNWIND)
@@ -393,7 +396,7 @@ endif()
 
 if(enable_smpi)
   SET(HAVE_SMPI 1)
-  if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux")
+  if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux|SunOS")
     SET(HAVE_PRIVATIZATION 1)
   else()
     message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")