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

diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
index efe931663a..fe0dd5dd20 100644
--- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
+++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake
@@ -11,7 +11,7 @@ find_path(HAVE_LUA_H lua.h
 )
 
 find_library(HAVE_LUA51_LIB
-    NAME lua.5.1 lua5.1 lua51 lua-5.1
+    NAME lua.5.1 lua5.1 lua51 lua-5.1 lua
     HINTS
     $ENV{LD_LIBRARY_PATH}
     PATH_SUFFIXES lib64 lib
@@ -36,18 +36,6 @@ if(HAVE_LUA_H AND HAVE_LUA51_LIB AND LIB_LUA_NAME AND HAVE_LUA_BIN)
  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 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)
@@ -57,21 +45,29 @@ mark_as_advanced(HAVE_LUA51_LIB)
 mark_as_advanced(HAVE_LUA_H)
 mark_as_advanced(HAVE_LUA_BIN)
 
-message("-- Looking for lua.h")
+message(STATUS "Looking for lua.h")
 if(HAVE_LUA_H)
-message("-- Looking for lua.h - found")
+message(STATUS "Looking for lua.h - found")
 else(HAVE_LUA_H)
-message("-- Looking for lua.h - not found")
+message(STATUS "Looking for lua.h - not found")
 endif(HAVE_LUA_H)
 
-message("-- Looking for lib lua")
+message(STATUS "Looking for lib lua")
 if(HAVE_LUA51_LIB)
-message("-- Looking for lib lua - found")
-message("-- Lib lua version: ${LIB_LUA_NAME}")
+message(STATUS "Looking for lib lua - found")
+message(STATUS "Lib lua version: ${LIB_LUA_NAME}")
 else(HAVE_LUA51_LIB)
-message("-- Looking for lib lua - not found")
+message(STATUS "Looking for lib lua - not found")
 endif(HAVE_LUA51_LIB)
 
 if(HAVE_LUA_BIN)
-message("-- Found Lua: ${HAVE_LUA_BIN}")
-endif(HAVE_LUA_BIN)
\ No newline at end of file
+message(STATUS "Found Lua: ${HAVE_LUA_BIN}")
+endif(HAVE_LUA_BIN)
+
+if(LUA51_FOUND)
+  set(HAVE_LUA 1)
+  include_directories(${LUA_INCLUDE_DIR})
+  link_directories(${LUA_LIBRARY_DIR})
+else(LUA51_FOUND)
+	message(STATUS "Warning : Lua need version 5.1")
+endif(LUA51_FOUND)