Deprecate e_smx_state_t.

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3e237c..e118fcf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,9 @@
 # Build the version number
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "24")
+set(SIMGRID_VERSION_MINOR "25")
 set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
 
-set(SIMGRID_VERSION_DATE  "2019") # Year for copyright information
-
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
 else()
@@ -232,7 +230,7 @@ if(enable_ns3)
 endif()
 
 set(SIMGRID_HAVE_MSG 0)
-if(enable_MSG)
+if(enable_msg)
   set(SIMGRID_HAVE_MSG 1)
 endif()
 
@@ -412,8 +410,8 @@ endif()
 mark_as_advanced(PATH_LIBDW_H)
 mark_as_advanced(PATH_LIBDW_LIB)
 
-if(enable_java AND NOT enable_MSG)
-  message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_MSG=ON or -Denable_java=OFF")
+if(enable_java AND NOT enable_msg)
+  message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_msg=ON or -Denable_java=OFF")
 endif()
 
 if (enable_model-checking AND enable_ns3)