X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/059ffba3002aa86e17392c7f2c884095ab64591b..1020d67a0bd55c63c2c98cf29304790e8684564d:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 3e180e389e..0cdc764033 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -6,9 +6,9 @@ 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")
 
 if(NOT CMAKE_INSTALL_PREFIX)
-	set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
+  set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
 else(NOT CMAKE_INSTALL_PREFIX)
-	set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
 endif(NOT CMAKE_INSTALL_PREFIX)
 
 set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
@@ -22,23 +22,18 @@ 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 "Turn this on to experiment with our prototype of model-checker (may hinder the performance of simulation)" off)
+option(enable_model-checking "Turn this on to experiment with our prototype of model-checker (hinders the simulation's performance even if turned of at runtime)" off)
 option(enable_lib_static "" off)
 option(enable_jedule "Jedule output of SimDAG." off)
 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)
+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 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)
@@ -67,9 +62,9 @@ mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)
 mark_as_advanced(SVN)
 mark_as_advanced(GIT)
-mark_as_advanced(CMAKE_OSX_ARCHITECTURES)                                                                                                                  
-mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)                                                                                                              
-mark_as_advanced(CMAKE_OSX_SYSROOT)                                                                         
+mark_as_advanced(CMAKE_OSX_ARCHITECTURES)
+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)