Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add a -I flag for lua.
[simgrid.git] / buildtools / Cmake / src / CMakeCompleteInFiles.txt
index 0ec3510..6b7aa7f 100644 (file)
@@ -210,6 +210,8 @@ if(NOT disable_lua)
        )
        if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
                set(HAVE_LUA 1)
+               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}")
@@ -230,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")