deprecate Engine::shutdown()

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90cb6b6..457be86 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Build the version number
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "29")
+set(SIMGRID_VERSION_MINOR "30")
 set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
@@ -409,7 +409,7 @@ if(enable_java AND NOT enable_msg)
 endif()
 
 if (enable_model-checking AND enable_ns3)
-  message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pulls too much dependencies for the MC to work")
+  message(WARNING "Activating both model-checking and ns-3 bindings is considered experimental.")
 endif()
 
 if(enable_smpi)
@@ -843,9 +843,9 @@ if(enable_python)
     if("${SIMGRID_PYTHON_LIBDIR}" STREQUAL "") # value not manually set
       if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
         set(SIMGRID_PYTHON_LIBDIR ${Python3_SITEARCH})
-      else()
+      else("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
         string(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" SIMGRID_PYTHON_LIBDIR ${Python3_SITEARCH})
-      endif()
+      endif("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
     endif()
     install(TARGETS python-bindings 
            LIBRARY DESTINATION "${SIMGRID_PYTHON_LIBDIR}")