Fix lua detection on apple and re-enable option lua and ruby. \But examples doesn...

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

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 6d20477..8d8a4af 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -29,8 +29,13 @@ else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 option(enable_gtnets "Whether gtnets model is activated." on)
 option(enable_java "Whether the Java bindings are activated." on)
+if(WIN32 OR APPLE) 
+option(enable_lua "Whether the lua bindings are activated." off)
+option(enable_ruby "Whether the Ruby bindings are activated." off)
+else(WIN32 OR APPLE)
 option(enable_lua "Whether the lua bindings are activated." on)
 option(enable_ruby "Whether the Ruby bindings are activated." on)
+endif(WIN32 OR APPLE) 
 option(enable_doc "Whether we should rebuild the documentation" off)
 option(enable_compile_optimizations "" off)
 option(enable_compile_warnings "Whether compilation warnings should be turned into errors." off)
@@ -47,25 +52,19 @@ option(enable_graphviz "" off)
 
 if(WIN32 OR APPLE) #actually not enable with windows and Apple
        message("-- Mode supernovae and maintainer are disabled.")
-    message("-- Model checking is disabled.")
-       message("-- Smpi, Ruby, Lua and GTnets 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_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) 
-       set(enable_model-checking false CACHE TYPE INTERNAL FORCE)
        mark_as_advanced(enable_supernovae)
     mark_as_advanced(enable_maintainer_mode)
-    mark_as_advanced(enable_lua)
-    mark_as_advanced(enable_ruby)
     mark_as_advanced(enable_smpi)
     mark_as_advanced(enable_gtnets)
     mark_as_advanced(gtnets_path)
-    mark_as_advanced(enable_model-checking)
 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")
@@ -83,6 +82,8 @@ 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)