X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1a642a7627700d858a267453aee7ffe6d494b87..d09bc4cfaff5a41da74973c2a4b0842457619d68:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 2707a5f984..8f883d62bc 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -20,7 +20,6 @@ option(enable_debug "Set NDEBUG flag" on)
 
 option(enable_gtnets "Whether gtnets model is activated." off)
 option(enable_ns3    "Whether ns3 model is activated." off)
-option(enable_smpi "Whether the smpi library is compiled." on)
 option(enable_lua "Whether the lua bindings are activated." off)
 option(enable_compile_warnings "Whether compilation warnings should be turned into errors." off)
 option(enable_maintainer_mode "Whether flex and flexml files should be rebuilt." off)
@@ -29,17 +28,22 @@ option(enable_latency_bound_tracking "" off)
 option(enable_coverage "Enable coverage." off)
 option(enable_memcheck "Enable memcheck." off)
 option(enable_print_message "Enable print message during config." off)
-option(enable_model-checking "" off)
+option(enable_model-checking "Turn this on to experiment with our prototype of model-checker (may hinder the performance of simulation)" off)
 option(enable_lib_static "" off)
 option(enable_jedule "Jedule output of SimDAG." off)
-option(enable_debug "Set NDEBUG flag" on)
+option(enable_debug "Turn this off to remove all debug messages at compile time (faster, but no debug activable)" on)
 option(enable_supernovae "Whether Supernovae mode (helping compiler optimization) is activated." on)
 
-if(enable_supernovae AND enable_model-checking)
-	set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
-	message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
-endif(enable_supernovae AND enable_model-checking)
+#if(enable_supernovae AND enable_model-checking)
+#	set(enable_model-checking OFF CACHE TYPE INTERNAL FORCE)
+#	message("\n\nCannot enable supernovae mode and model-checking at the same time (yet)\n\n")
+#endif(enable_supernovae AND enable_model-checking)
 
+if(WIN32)
+  option(enable_smpi "Whether the smpi library is compiled." off)
+else(WIN32)
+  option(enable_smpi "Whether the smpi library is compiled." on)
+endif(WIN32)
 
 mark_as_advanced(HAVE_SSH)
 mark_as_advanced(HAVE_RSYNC)