Java sources.

[simgrid.git] / buildtools / Cmake / src / CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index f87a230..913a936 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -37,9 +37,6 @@ else(disable_java)
        endif(JAVA_INCLUDE_PATH)        
        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))
-               endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        else(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH) 
                SET(HAVE_JAVA 0)
        endif(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
@@ -201,18 +198,22 @@ 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}")
-       if(HAVE_LUA5_1_LUALIB_H)
+       find_path(HAVE_LUA5_1_LUALIB_H
+       NAMES lualib.h 
+       PATHS "/sw/include/" "/usr/include/lua5.1/"
+       )
+       find_path(HAVE_LUA5_1_LAUXLIB_H
+       NAMES lauxlib.h
+       PATHS "/sw/include/" "/usr/include/lua5.1/"
+       )
+       if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
                set(HAVE_LUA 1)
-       endif(HAVE_LUA5_1_LUALIB_H)
+       endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 endif(NOT disable_lua)
 #message("HAVE_LUA ${HAVE_LUA}")
+#message("${HAVE_LUA5_1_LUALIB_H} AND ${HAVE_LUA5_1_LAUXLIB_H}")
 
 #message("______END_CONTEXT______")