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

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 82500e4713..134d16076e 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -8,11 +8,11 @@ set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")
 
 set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
 
-if(NOT prefix)
-	set(prefix "/usr/local/simgrid/" CACHE PATH "Path where to install project")
-else(NOT prefix)
-	set(prefix ${prefix} CACHE PATH "Path where to install project")
-endif(NOT prefix)
+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(with_context ${with_context} CACHE TYPE INTERNAL FORCE)
 
@@ -34,10 +34,10 @@ option(enable_lua "Whether the lua bindings are activated." on)
 option(enable_ruby "Whether the Ruby bindings are activated." on)
 endif(WIN32 OR APPLE) 
 option(enable_doc "Whether we should rebuild the documentation" off)
-option(enable_compile_optimizations "" off)
+option(enable_compile_optimizations "" on)
 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_supernovae "Whether Supernovae mode (helping compiler optimization) is activated." off)
+option(enable_supernovae "Whether Supernovae mode (helping compiler optimization) is activated." on)
 option(enable_tracing "Tracing MSG (for now) simulations for visualization." off)
 option(enable_latency_bound_tracking "" off)
 option(enable_coverage "Enable coverage." off)
@@ -45,7 +45,6 @@ option(enable_memcheck "Enable memcheck." off)
 option(enable_print_message "Enable print message during config." off)
 option(enable_model-checking "" off)
 option(enable_lib_static "" off)
-option(enable_graphviz "" off)
 option(GRAS_IS_BROKEN "Set some tests are broken" off)
 
 if(enable_supernovae AND enable_model-checking)
@@ -68,7 +67,6 @@ mark_as_advanced(ADDR2LINE)
 mark_as_advanced(BIBTOOL_PATH)
 mark_as_advanced(BUILD_TESTING)
 mark_as_advanced(CMAKE_BUILD_TYPE)
-mark_as_advanced(CMAKE_INSTALL_PREFIX)
 mark_as_advanced(DART_ROOT)
 mark_as_advanced(DOXYGEN_PATH)
 mark_as_advanced(FIG2DEV_PATH)