X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e93bd4b841fecdf461434ee45a7dd58e62e4d5b1..9b39bafc27f084e23751d10f11af8d6998cb09c9:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index df92f593ca..2a7c638fc9 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -3,6 +3,7 @@
 
 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")
 
 if(NOT prefix)
 	set(prefix "/usr/local/simgrid/" CACHE PATH "Path where to install project")
@@ -16,13 +17,15 @@ 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_java "This variable set the java context." on)
 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)
@@ -40,6 +43,11 @@ 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)
@@ -47,9 +55,11 @@ if(enable_supernovae AND enable_model-checking)
 	message("\n\nWith supernovae mode the model checking must be disable.!!!\n\n")
 endif(enable_supernovae AND enable_model-checking)
 
+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(enable_print_message)
 mark_as_advanced(BIBTEX2HTML_PATH)
 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(LUA_LIB_PATH_2)
@@ -70,7 +80,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)