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

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 82500e4713..0b121faf38 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -4,49 +4,41 @@
 
 
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
-set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")
-
+set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
 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)
-
-set(with_context ${with_context} CACHE TYPE INTERNAL FORCE)
-
-if(NOT with_context)
-	set(with_context "auto" CACHE TYPE INTERNAL FORCE)
-endif(NOT with_context)
+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(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
 
-
-option(enable_smpi "This variable set smpi lib." on)
 option(enable_gtnets "Whether gtnets model is activated." on)
 option(enable_java "Whether the Java bindings are activated." on)
-if(WIN32 OR APPLE) 
-option(enable_lua "Whether the lua bindings are activated." off)
-option(enable_ruby "Whether the Ruby bindings are activated." off)
-else(WIN32 OR APPLE)
+option(enable_smpi "This variable set smpi lib." on)
 option(enable_lua "Whether the lua bindings are activated." on)
 option(enable_ruby "Whether the Ruby bindings are activated." on)
+option(enable_pcre "Whether the pcre lib is activated." on) 
+
+if(WIN32 OR APPLE) 
+set(enable_smpi off CACHE TYPE INTERNAL FORCE)
+set(enable_lua off CACHE TYPE INTERNAL FORCE)
+set(enable_ruby off CACHE TYPE INTERNAL FORCE)
 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_tracing "Tracing MSG (for now) simulations for visualization." off)
+option(enable_supernovae "Whether Supernovae mode (helping compiler optimization) is activated." on)
+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_lib_static "" off)
-option(enable_graphviz "" off)
-option(GRAS_IS_BROKEN "Set some tests are broken" off)
 
 if(enable_supernovae AND enable_model-checking)
 	set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
@@ -62,13 +54,11 @@ mark_as_advanced(HAVE_RSYNC)
 mark_as_advanced(BIBTEX2HTML_PATH)
 mark_as_advanced(RUBY_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(RUBY_LIB_PATH_2)
-mark_as_advanced(CLEAR gtnets_path)
 mark_as_advanced(BUILDNAME)
 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)
@@ -85,4 +75,6 @@ mark_as_advanced(PATH_PCRE_H)
 mark_as_advanced(CMAKE_OSX_ARCHITECTURES)                                                                                                                  
 mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)                                                                                                              
 mark_as_advanced(CMAKE_OSX_SYSROOT)                                                                         
-mark_as_advanced(GRAS_IS_BROKEN)
\ No newline at end of file
+mark_as_advanced(SED_EXE)
+mark_as_advanced(BIBTEX2HTML)
+mark_as_advanced(enable_pcre)
\ No newline at end of file