Add verification of bin lua.

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

diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
index f540377..359a921 100644 (file)
--- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
+++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
@@ -23,16 +23,18 @@ find_library(HAVE_LUA51_LIB
     /usr
 )
 
     /usr
 )
 

+find_program(HAVE_LUA_BIN NAMES lua)
+

 set(LIB_LUA_NAME ${HAVE_LUA51_LIB})
 string(REGEX MATCH "liblua.*$" LIB_LUA_NAME "${LIB_LUA_NAME}")
 string(REPLACE ".${LIB_EXE}" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
 string(REPLACE "lib" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
 
 set(LIB_LUA_NAME ${HAVE_LUA51_LIB})
 string(REGEX MATCH "liblua.*$" LIB_LUA_NAME "${LIB_LUA_NAME}")
 string(REPLACE ".${LIB_EXE}" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
 string(REPLACE "lib" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
 

-if(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME)
+if(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME AND HAVE_LUA_BIN)

  set(LUA51_FOUND 1)
  string(REPLACE "/lua.h" "" LUA_INCLUDE_DIR ${HAVE_LUA_H})
  string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${HAVE_LUA51_LIB})
  set(LUA51_FOUND 1)
  string(REPLACE "/lua.h" "" LUA_INCLUDE_DIR ${HAVE_LUA_H})
  string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${HAVE_LUA51_LIB})

-endif(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME)
+endif(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME AND HAVE_LUA_BIN)

 
 set(LUA_CPATH "$ENV{LUA_CPATH}")
 string(REGEX MATCH "${LIB_EXE}" LUA_CPATH "${LUA_CPATH}")
 
 set(LUA_CPATH "$ENV{LUA_CPATH}")
 string(REGEX MATCH "${LIB_EXE}" LUA_CPATH "${LUA_CPATH}")


@@ -52,4 +54,5 @@ mark_as_advanced(LUA_LIB_PATH_3)
 mark_as_advanced(HAVE_LUA5_1_LAUXLIB_H)                        
 mark_as_advanced(HAVE_LUA5_1_LUALIB_H)
 mark_as_advanced(HAVE_LUA51_LIB)                                                                                                                                                                             
 mark_as_advanced(HAVE_LUA5_1_LAUXLIB_H)                        
 mark_as_advanced(HAVE_LUA5_1_LUALIB_H)
 mark_as_advanced(HAVE_LUA51_LIB)                                                                                                                                                                             

-mark_as_advanced(HAVE_LUA_H)
\ No newline at end of file
+mark_as_advanced(HAVE_LUA_H)
+mark_as_advanced(HAVE_LUA_BIN)
\ No newline at end of file

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index a6fc1d4..f39bd0e 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -108,6 +108,7 @@ if(enable_print_message)
     message("LUA_INCLUDE_DIR = ${LUA_INCLUDE_DIR}")
     message("LIB_LUA_NAME = ${LIB_LUA_NAME}")
     message("LUA_LIBRARY_DIR = ${LUA_LIBRARY_DIR}")
     message("LUA_INCLUDE_DIR = ${LUA_INCLUDE_DIR}")
     message("LIB_LUA_NAME = ${LIB_LUA_NAME}")
     message("LUA_LIBRARY_DIR = ${LUA_LIBRARY_DIR}")

+    message("LUA_BIN = ${HAVE_LUA_BIN}")

     
        endif(enable_lua)
        if(enable_memcheck)
     
        endif(enable_lua)
        if(enable_memcheck)