X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3188bf813cdbb766deb1bd3ba2be8512a1664fca..1935959838c77517301ec0438b61ef3a213f497d:/buildtools/Cmake/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 8fe7fcf7b6..87f8e57fc6 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -198,18 +198,46 @@ 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/"
+	)
+	find_library(LUA_LIB_PATH_1
+	NAMES lua5.1
+	PATHS /usr
+	)
+	find_library(LUA_LIB_PATH_2
+	NAMES lua-5.1
+	PATHS /usr
+	)
+
+	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} -I${HAVE_LUA5_1_LAUXLIB_H} ")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H} ")
+	endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
+
+	if(LUA_LIB_PATH_1)
+		set(liblua lua5.1)
+	endif(LUA_LIB_PATH_1)
+
+	if(LUA_LIB_PATH_2)
+		set(liblua lua-5.1)
+	endif(LUA_LIB_PATH_2)
+
+	if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2)
+		set(HAVE_LUA 0)
+	endif(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2)
+
 endif(NOT disable_lua)
 #message("HAVE_LUA ${HAVE_LUA}")
+#message("${HAVE_LUA5_1_LUALIB_H} AND ${HAVE_LUA5_1_LAUXLIB_H}")
 
 #message("______END_CONTEXT______")
 
@@ -226,7 +254,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")
@@ -631,7 +659,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)
 
@@ -643,8 +671,11 @@ set(top_srcdir ${PROJECT_DIRECTORY})
 set(includedir ${prefix}/include)
 set(top_builddir ${PROJECT_DIRECTORY})
 set(libdir ${exec_prefix}/lib)
-configure_file(${PROJECT_DIRECTORY}/buildtools/Cmake/src/smpicc.in ${PROJECT_DIRECTORY}/src/smpi/smpicc @ONLY)
-configure_file(${PROJECT_DIRECTORY}/buildtools/Cmake/src/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY)
 
+configure_file(${PROJECT_DIRECTORY}/src/smpi/smpicc.in  ${PROJECT_DIRECTORY}/src/smpi/smpicc @ONLY)
+configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY)
+
+exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpicc" OUTPUT_VARIABLE OKITOKI)
+exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpirun" OUTPUT_VARIABLE OKITOKI)
 
 #message("__END_GRAS_&_SIMGRID____\n")