X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7354dcbcc4ff6563bd0b247c5304dd3c24557186..8f7873c57495707ccbdad488eab21356bf5496d7:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 8d8a4af607..f33368ef06 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)
 
@@ -22,11 +22,8 @@ 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_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) 
@@ -48,22 +45,7 @@ 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)
-
-if(WIN32 OR APPLE) #actually not enable with windows and Apple
-	message("-- Mode supernovae and maintainer are disabled.")
-	message("-- Smpi and GTnets are disabled.")
-	set(enable_supernovae false CACHE TYPE INTERNAL FORCE)
-	set(enable_maintainer_mode false CACHE TYPE INTERNAL FORCE)
-	set(enable_smpi false CACHE TYPE INTERNAL FORCE)
-	set(enable_gtnets false CACHE TYPE INTERNAL FORCE) 
-	mark_as_advanced(enable_supernovae)
-    mark_as_advanced(enable_maintainer_mode)
-    mark_as_advanced(enable_smpi)
-    mark_as_advanced(enable_gtnets)
-    mark_as_advanced(gtnets_path)
-endif(WIN32 OR APPLE)
-
+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)
@@ -77,13 +59,6 @@ mark_as_advanced(HAVE_RSYNC)
 #mark_as_advanced(enable_memcheck)
 #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)
-mark_as_advanced(LUA_LIB_PATH_3)
-mark_as_advanced(HAVE_LUA5_1_LAUXLIB_H)                        
-mark_as_advanced(HAVE_LUA5_1_LUALIB_H)
-mark_as_advanced(HAVE_LUA51_LIB)                                                                                                                                                                             
-mark_as_advanced(HAVE_LUA_H)
 mark_as_advanced(RUBY_LIB_PATH_1)                                                                                                                      
 mark_as_advanced(RUBY_LIB_PATH_2)
 mark_as_advanced(CLEAR gtnets_path)
@@ -92,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)
@@ -102,7 +76,6 @@ mark_as_advanced(PERL_EXECUTABLE)
 mark_as_advanced(GCOV_PATH)
 mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)
-mark_as_advanced(SED_EXE)
 mark_as_advanced(SVN)
 mark_as_advanced(GIT)
 mark_as_advanced(VALGRIND_PATH)
@@ -110,10 +83,4 @@ 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(HAVE_AGRAPH_H)
-mark_as_advanced(HAVE_CGRAPH_H)                                                                                
-mark_as_advanced(HAVE_GRAPH_H)                                                                                  
-mark_as_advanced(HAVE_GRAPH_LIB)
-mark_as_advanced(HAVE_CGRAPH_LIB)
-mark_as_advanced(HAVE_AGRAPH_LIB)
-mark_as_advanced(HAVE_CDT_LIB)
\ No newline at end of file
+mark_as_advanced(GRAS_IS_BROKEN)
\ No newline at end of file