X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..5f5a10db6fc4552782638abb4817041223e17775:/tools/cmake/Option.cmake

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index 36ac349232..e35aa12748 100644
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -1,5 +1,5 @@
 ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see below)
-### ex: cmake -Denable_java=ON -Denable_ns3=ON ./
+### ex: cmake -Denable_ns3=ON ./
 
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 
@@ -23,35 +23,46 @@ option(enable_debug                 "Turn this off to remove all debug messages
 option(enable_documentation "Whether to produce documentation" off)
 
 option(enable_ns3            "Whether ns-3 model is activated." off)
-option(enable_java           "Whether the Java bindings are activated." off)
-option(enable_lib_in_jar     "Whether the native libraries are bundled in a Java jar file" on)
-option(minimal-bindings      "Whether to compile the bindings libraries (Java/Python) with the minimal dependency set" off)
-mark_as_advanced(minimal-bindings)
-if(minimal-bindings)
-  set(enable_lib_in_jar on)
+option(enable_msg            "Java was removed from SimGrid v3.33. Please do not enable it here." off)
+mark_as_advanced(enable_msg)
+if (enable_msg)
+  message(FATAL_ERROR "MSG was removed from SimGrid v3.33. Please stick to v3.32 or earlier if you need Java.")
+endif()
+
+option(enable_java            "Java was removed from SimGrid v3.33. Please do not enable it here." off)
+mark_as_advanced(enable_java)
+if (enable_java)
+  message(FATAL_ERROR "Java was removed from SimGrid v3.33. Please stick to v3.32 or earlier if you need Java.")
 endif()
 
-option(enable_lua            "Whether the Lua bindings are activated." off)
+option(minimal-bindings      "Whether to compile the Python bindings libraries with the minimal dependency set" off)
+mark_as_advanced(minimal-bindings)
 
-option(enable_model-checking "Turn this on to experiment with our prototype of model-checker (hinders the simulation's performance even if turned off at runtime)" off)
-option(enable-model-checking "Please set 'enable_model-checking' instead" off)
+option(enable_model-checking "Turn this on to experiment with our prototype of model-checker" on)
+option(enable-model-checking "Please set 'enable_model-checking' instead" on)
 mark_as_advanced(enable-model-checking)
 if(enable-model-checking)
   SET(enable_model-checking ON CACHE BOOL "Whether to compile the model-checker" FORCE)
 endif()
 
-option(enable_jedule         "Jedule output of SimDAG." off)
+option(enable_smpi "Whether SMPI is included in the library." on)
+option(enable_smpi_papi    "Whether SMPI supports PAPI bindings." off)
 
-if(WIN32)
-  option(enable_smpi "Whether SMPI is included in the library." off)
-else()
-  option(enable_smpi "Whether SMPI is included in the library." on)
-  # PAPI does not support windows (they did in 3.7, but not anymore in 5.x)
-  # See http://icl.cs.utk.edu/papi/custom/index.html?lid=62&slid=96
-  option(enable_smpi_papi    "Whether SMPI supports PAPI bindings." off)
+option(enable_testsuite_smpi_MPICH3 "Whether the test suite form MPICH 3 should be built." off)
+option(enable_smpi_MPICH3_testsuite "Please use 'enable_testsuite_smpi_MPICH3' instead." off)
+mark_as_advanced(enable_smpi_MPICH3_testsuite)
+if(enable_smpi_MPICH3_testsuite)
+  SET(enable_testsuite_smpi_MPICH3 ON CACHE BOOL "Whether the test suite form MPICH 3 should be built." FORCE)
+endif()
+
+option(enable_testsuite_smpi_MBI "Whether the test suite from MBI should be built." off)
+option(enable_smpi_MBI_testsuite "Please use 'enable_testsuite_smpi_MBI' instead." off)
+mark_as_advanced(enable_smpi_MBI_testsuite)
+if(enable_smpi_MBI_testsuite)
+  SET(enable_testsuite_smpi_MBI ON CACHE BOOL "Whether the test suite from MBI should be built." FORCE)
 endif()
-option(enable_smpi_MPICH3_testsuite "Whether the test suite form MPICH 3 should be built" off)
-option(enable_smpi_ISP_testsuite "Whether the test suite from ISP should be built." off)
+
+option(enable_testsuite_McMini "Whether the test suite from McMini should be built." off)
 
 # Internal targets used by jenkins
 ###