X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0260dd6f0ea8f3b4ca41adbe1c9e4ce0ed333b29..a358e7ed1de9ba360d9b4644546ef97dbaaac6fd:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 5650bbd79a..6cbe6d95ca 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -1,20 +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)
-
-	if(EXISTS "/usr/include/graphviz")
-		set(include_graphviz "/usr/include/graphviz")
-	endif(EXISTS "/usr/include/graphviz")
-	if(EXISTS "/usr/local/include/graphviz")
-		set(include_graphviz "/usr/local/include/graphviz")
-	endif(EXISTS "/usr/local/include/graphviz")
-	
-	set(CGRAPH_PATH ${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")
@@ -31,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)
@@ -62,6 +50,8 @@ 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)
@@ -85,7 +75,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)