Merge branch 'v3_8_x'

[simgrid.git] / buildtools / Cmake / Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 0e4225f..8b723ec 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -6,10 +6,10 @@ 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")
-else(NOT CMAKE_INSTALL_PREFIX)
-       set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
-endif(NOT CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
+else()
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
+endif()
 
 set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
 
@@ -26,24 +26,20 @@ 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_mallocators "Enable mallocators (for debugging purpose)." on)
 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." 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)
+else()
   option(enable_smpi "Whether the smpi library is compiled." on)
-endif(WIN32)
+endif()
 
 mark_as_advanced(HAVE_SSH)
 mark_as_advanced(HAVE_RSYNC)
@@ -67,9 +63,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)