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

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 44470e9af5..0e4225fa8c 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -4,7 +4,6 @@
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
 set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include")
-set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
 
 if(NOT CMAKE_INSTALL_PREFIX)
 	set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
@@ -23,21 +22,22 @@ option(enable_ns3    "Whether ns3 model is activated." off)
 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)
-option(enable_tracing "Tracing simulations for visualization." off)
+option(enable_tracing "Tracing simulations for visualization." on)
 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_supernovae "Whether Supernovae mode (helping compiler optimization) is activated." 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." off)
+option(enable_msg_deprecated "This option enable the use of msg deprecated functions" off)
 
-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)
@@ -72,3 +72,4 @@ mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
 mark_as_advanced(CMAKE_OSX_SYSROOT)                                                                         
 mark_as_advanced(SED_EXE)
 mark_as_advanced(BIBTEX2HTML)
+mark_as_advanced(CMAKE_C_LINK_FLAGS)