X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eed3e7fe019d793e0fa646512ffad1cabf9c61de..318bcc114181c269f881648768046c679108f1df:/buildtools/Cmake/src/CMakeCompleteInFiles.txt?ds=sidebyside

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 474ab32055..6b7aa7f43a 100644
--- 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(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)
@@ -207,11 +204,18 @@ if(NOT disable_lua)
 	NAMES lualib.h 
 	PATHS "/sw/include/" "/usr/include/lua5.1/"
 	)
-	if(HAVE_LUA5_1_LUALIB_H)
+	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)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} ")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${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______")
 
@@ -228,7 +232,7 @@ endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn)
 
 if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 	find_file(GIT ".git" ${PROJECT_DIRECTORY})
-	exec_program("git --git-dir=${PROJECT_DIRECTORY} log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION")
+	exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION")
 	#message("GIT_VERSION ${GIT_VERSION}")
 endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 #message("________END_SVN________\n")
@@ -633,7 +637,7 @@ CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
 configure_file(${PROJECT_DIRECTORY}/src/context_sysv_config.h.in ${PROJECT_DIRECTORY}/src/context_sysv_config.h)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" "${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${PROJECT_DIRECTORY}/include/simgrid_config.h)