X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b0c189a3dc6477ffada0e3315baac3c12930c24..484fe465939b887bb9b146f1ca7f95402b8539f2:/buildtools/Cmake/Option.cmake

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index e89b3f8b44..82500e4713 100644
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -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) 
@@ -51,16 +48,6 @@ option(enable_lib_static "" off)
 option(enable_graphviz "" off)
 option(GRAS_IS_BROKEN "Set some tests are broken" off)
 
-if(WIN32 OR APPLE) #actually not enable with windows and Apple
-	message("-- Smpi and GTnets are disabled.")
-	set(enable_smpi false CACHE TYPE INTERNAL FORCE)
-	set(enable_gtnets false CACHE TYPE INTERNAL FORCE) 
-    mark_as_advanced(enable_smpi)
-    mark_as_advanced(enable_gtnets)
-    mark_as_advanced(gtnets_path)
-endif(WIN32 OR APPLE)
-
-
 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")
@@ -73,13 +60,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)
@@ -98,7 +78,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)
@@ -106,11 +85,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)
 mark_as_advanced(GRAS_IS_BROKEN)
\ No newline at end of file