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

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 9a660662ee..af31674360 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -7,27 +7,32 @@ 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)
+else()
   set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
-endif(NOT CMAKE_INSTALL_PREFIX)
+endif()
 
 set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
+mark_as_advanced(pipol_user)
 
 option(release "Whether Release Mode is activated (disable tests on experimental parts)" on)
-option(enable_compile_optimizations "" on)
+option(enable_compile_optimizations "Whether to produce efficient code for the SimGrid library" on)
 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_lua "Whether the lua bindings are activated." off)
+option(enable_java   "Whether the Java bindings are 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." on)
 option(enable_latency_bound_tracking "" off)
 option(enable_coverage "Enable coverage." off)
+mark_as_advanced(enable_coverage)
 option(enable_memcheck "Enable memcheck." off)
-option(enable_mallocators "Enable mallocators (for debugging purpose)." on)
+mark_as_advanced(enable_memcheck)
+option(enable_mallocators "Enable mallocators (disable only for debugging purpose)." on)
 option(enable_print_message "Enable print message during config." off)
+mark_as_advanced(enable_print_message)
 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)
@@ -37,15 +42,12 @@ option(enable_msg_deprecated "This option enable the use of msg deprecated funct
 
 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)
-#mark_as_advanced(enable_coverage)
-#mark_as_advanced(enable_memcheck)
-#mark_as_advanced(enable_print_message)
 mark_as_advanced(BIBTEX2HTML_PATH)
 mark_as_advanced(BUILDNAME)
 mark_as_advanced(ADDR2LINE)
@@ -69,3 +71,5 @@ mark_as_advanced(CMAKE_OSX_SYSROOT)
 mark_as_advanced(SED_EXE)
 mark_as_advanced(BIBTEX2HTML)
 mark_as_advanced(CMAKE_C_LINK_FLAGS)
+mark_as_advanced(CMAKE_CXX_FLAGS)
+mark_as_advanced(CMAKE_Fortran_LINK_FLAGS)