Kill enable_graphviz cmake variable

[simgrid.git] / buildtools / Cmake / Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 340ac7590cb78f037becc50fe60457f4de2e42d1..f33368ef06c6d5cd7ca0ff334c668c3159424f7d 100644 (file)
--- 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,7 +45,6 @@ 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)
@@ -71,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)