X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/927ff2aaa452cb0c33c3d37c2c1bc1d2135b2644..56634156c33c9d551211a57579d526f8f35d9911:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index a3e2766c5b..807a7764bb 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -1,12 +1,6 @@
 ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after)
 ### ex: cmake -Denable_java=ON -Denable_gtnets=ON ./
 
-if(APPLE AND NOT CGRAPH_PATH)
-	set(CGRAPH_PATH "/opt/local/include/graphviz" CACHE PATH "Path to cgraph.h")
-else(APPLE AND NOT CGRAPH_PATH)
-	set(CGRAPH_PATH "/usr/include/graphviz" CACHE PATH "Path to cgraph.h")
-endif(APPLE AND NOT CGRAPH_PATH)
-
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 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")
@@ -23,21 +17,24 @@ if(NOT with_context)
 	set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
+set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
+
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	option(enable_smpi "This variable set smpi lib." off) #for the moment it doesn't compil with MacOS
 else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	option(enable_smpi "This variable set smpi lib." on)
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-option(enable_gtnets "This variable set the gtnets context." on)
-option(enable_java "This variable set the java context." off)
-option(enable_lua "This variable set lua use." on)
-option(enable_ruby "This variable set ruby use." on)
-option(enable_doc "Setting true this variable enable making the simgrid documentation." off)
+option(enable_gtnets "Whether gtnets model is activated." on)
+option(enable_java "Whether the Java bindings are activated." on)
+option(enable_lua "Whether the lua bindings are activated." on)
+option(enable_ruby "Whether the Ruby bindings are activated." on)
+option(enable_doc "Whether we should rebuild the documentation" off)
 option(enable_compile_optimizations "" off)
-option(enable_compile_warnings "" off)
-option(enable_maintainer_mode "Permit to make flex and flexml files." off)
-option(enable_supernovae "Supernovae mode." 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_supernovae "Whether Supernovae mode (helping compiler optimization) is activated." off)
 option(enable_tracing "Tracing MSG (for now) simulations for visualization." off)
+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)
@@ -47,15 +44,22 @@ if(WIN32) #actually not enable with windows
 	message("Mode supernovae and maintainer disable with Windows.")
 	set(enable_supernovae false CACHE TYPE INTERNAL FORCE)
 	set(enable_maintainer_mode false CACHE TYPE INTERNAL FORCE)
+	set(enable_java false CACHE TYPE INTERNAL FORCE)
+	set(enable_lua false CACHE TYPE INTERNAL FORCE)
+	set(enable_ruby false CACHE TYPE INTERNAL FORCE)
+	set(enable_smpi false CACHE TYPE INTERNAL FORCE)
+	set(enable_gtnets false CACHE TYPE INTERNAL FORCE)
 endif(WIN32)
 
 if(enable_supernovae AND enable_model-checking)
 	set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
 	message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
 endif(enable_supernovae AND enable_model-checking)
-
-mark_as_advanced(enable_coverage)
-mark_as_advanced(enable_memcheck)
+mark_as_advanced(PATH_PCRE_LIB)
+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(LUA_LIB_PATH_1)                                                                                                                      
@@ -77,7 +81,7 @@ mark_as_advanced(DOXYGEN_PATH)
 mark_as_advanced(FIG2DEV_PATH)
 mark_as_advanced(FLEXML_EXE)
 mark_as_advanced(FLEX_EXE)
-mark_as_advanced(PERL_EXE)
+mark_as_advanced(PERL_EXECUTABLE)
 mark_as_advanced(GCOV_PATH)
 mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)