X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/57291445b606fdad7278562584796cd445ba8ec6..940968cc3d5458d6fa3d32a8541175064a6f2b95:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1af2402223..34d5caa427 100644
--- 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)