X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/940c16ac4618d80e15068fea102fc8b0d58ddab8..60087ab28ce5450ad32f128cffbb09eb492eb550:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18e19acc73..b46a981833 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,8 +90,8 @@ endif()
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "13")
-set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_PATCH "90")
+set(SIMGRID_VERSION_EXTRA "-prealpha") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2016") # Year for copyright information
 
@@ -371,6 +371,10 @@ else()
   SET(HAVE_MMALLOC 0)
 endif()
 
+if (enable_model-checking AND enable_ns3)
+  message(FATAL_ERROR "Cannot activate both model-checking and NS3 bindings: NS3 pull too much dependencies for the MC to work")
+endif()
+
 if(enable_smpi)
   include(FindGFortran)
   SET(HAVE_SMPI 1)