Correction of a bug.

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

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 5f60dac..474ab32 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -38,7 +38,7 @@ else(disable_java)
        if(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
                SET(HAVE_JAVA 1)
                if(CMAKE_SYSTEM_NAME MATCHES "Darwin") #JAVA doesn't work yet on Mac
-                       set(SET(HAVE_JAVA 0))
+                       SET(HAVE_JAVA 0)
                endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        else(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH) 
                SET(HAVE_JAVA 0)

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 4aa0ce7..d2a59a4 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -282,7 +282,8 @@ set(AMOK_SRC
 
 set(LUA_SRC
        ${PROJECT_DIRECTORY}/src/simix/smx_context_lua.c
-       ${PROJECT_DIRECTORY}/src/bindings/lua/Msglua.c
+       #${PROJECT_DIRECTORY}/src/bindings/lua/Msglua.c
+       ${PROJECT_DIRECTORY}/src/bindings/lua/simgrid_lua.c
 )
 
 set(RUBY_SRC