From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 22 Mar 2010 10:28:48 +0000 (+0000)
Subject: By default active lua and ruby.
X-Git-Tag: SVN~444
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7cadd89d711803dd768f9c9b59968188f4ce285e

By default active lua and ruby.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7295 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index f87a230c33..5f60dac698 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -201,13 +201,12 @@ endif(NOT with_context_ok)
 #message("CONTEXT_THREADS ${CONTEXT_THREADS}")
 #message("CONTEXT_UCONTEXT ${CONTEXT_UCONTEXT}")
 set(HAVE_LUA 0)
+
 if(NOT disable_lua)
-	if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-		CHECK_INCLUDE_FILE(lualib.h HAVE_LUA5_1_LUALIB_H)
-	elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-		CHECK_INCLUDE_FILE(lua5.1/lualib.h HAVE_LUA5_1_LUALIB_H)
-	endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-	#message("HAVE_LUA5_1_LUALIB_H ${HAVE_LUA5_1_LUALIB_H}")
+	find_path(HAVE_LUA5_1_LUALIB_H
+	NAMES lualib.h 
+	PATHS "/sw/include/" "/usr/include/lua5.1/"
+	)
 	if(HAVE_LUA5_1_LUALIB_H)
 		set(HAVE_LUA 1)
 	endif(HAVE_LUA5_1_LUALIB_H)
diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt
index d0bcc59dcb..c38142f75d 100644
--- a/buildtools/Cmake/src/CMakeOption.txt
+++ b/buildtools/Cmake/src/CMakeOption.txt
@@ -8,14 +8,14 @@ if(NOT with_context)
 	set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
-option(enable_maintainer_mode "Permit to make flex and flexml files." off)
-option(supernovae "Supernovae mode." off)
 option(disable_java "This variable set the java context." off)
 option(disable_lua "This variable set lua use." off)
+option(disable_gtnets "This variable set the gtnets context." off)
+option(disable_ruby "This variable set ruby use." off)
 option(enable_compile_warnings "" off)
 option(enable_compile_optimizations "" off)
-option(disable_gtnets "This variable set the gtnets context." off)
-option(disable_ruby "This variable set ruby use." on)
+option(enable_maintainer_mode "Permit to make flex and flexml files." off)
+option(supernovae "Supernovae mode." off)
 
 mark_as_advanced(CLEAR gtnets_path)
 mark_as_advanced(BUILDNAME)