X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe39610cd8c7b073a712d1405588512331c4c6d7..8f7873c57495707ccbdad488eab21356bf5496d7:/buildtools/Cmake/Modules/FindLua51Simgrid.cmake

diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
index 4fe6ee044c..359a921a9b 100644
--- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
+++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
@@ -1,7 +1,7 @@
 find_path(HAVE_LUA_H lua.h
     HINTS
     $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES lua/ lua/5.1/ include/ include/lua5.1/
+    PATH_SUFFIXES lua/ lua/5.1/ include/ include/lua5.1/ include/lua51 include/lua
     PATHS
     /opt
     /opt/local
@@ -11,9 +11,10 @@ find_path(HAVE_LUA_H lua.h
 )
 
 find_library(HAVE_LUA51_LIB
-    NAME lua.5.1 lua5.1
+    NAME lua.5.1 lua5.1 lua51 lua-5.1
     HINTS
     $ENV{LD_LIBRARY_PATH}
+    PATH_SUFFIXES lib64 lib
     PATHS
     /opt
     /opt/local
@@ -22,13 +23,36 @@ find_library(HAVE_LUA51_LIB
     /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}")
 
-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})
-endif(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME)
\ No newline at end of file
+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}")
+
+if(LUA_CPATH AND APPLE)
+    message("-- LUA_CPATH have extension ${LIB_EXE}")
+else(DEFINED LUA_CPATH AND APPLE)
+	if(APPLE)
+    message("-- Please set LUA_CPATH with extension ${LIB_EXE}")
+    message("-- For example, execute command line : export LUA_CPATH=\"./?.${LIB_EXE}\"")
+    endif(APPLE)
+endif(LUA_CPATH AND APPLE)
+
+mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      
+mark_as_advanced(LUA_LIB_PATH_2)
+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_LUA_H)
+mark_as_advanced(HAVE_LUA_BIN)
\ No newline at end of file