From 581d3ff66af5e50bcb3c42b96fb9cad10c32d467 Mon Sep 17 00:00:00 2001 From: navarro Date: Fri, 22 Jun 2012 14:09:14 +0200 Subject: [PATCH 1/1] Use cmake module for lua51 --- .../Cmake/Modules/FindLua51Simgrid.cmake | 82 ++++++------------- 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake index fe0dd5dd20..eb95ff455f 100644 --- a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake +++ b/buildtools/Cmake/Modules/FindLua51Simgrid.cmake @@ -1,69 +1,39 @@ -find_path(HAVE_LUA_H lua.h - HINTS - $ENV{LD_LIBRARY_PATH} - PATH_SUFFIXES lua/ lua/5.1/ include/ include/lua5.1/ include/lua51 include/lua - PATHS - /opt - /opt/local - /opt/csw - /sw - /usr -) - -find_library(HAVE_LUA51_LIB - NAME lua.5.1 lua5.1 lua51 lua-5.1 lua - HINTS - $ENV{LD_LIBRARY_PATH} - PATH_SUFFIXES lib64 lib - PATHS - /opt - /opt/local - /opt/csw - /sw - /usr -) - +include(FindLua51) 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 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 AND HAVE_LUA_BIN) - -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) - message(STATUS "Looking for lua.h") -if(HAVE_LUA_H) +if(LUA_INCLUDE_DIR) message(STATUS "Looking for lua.h - found") -else(HAVE_LUA_H) +else(LUA_INCLUDE_DIR) message(STATUS "Looking for lua.h - not found") -endif(HAVE_LUA_H) - -message(STATUS "Looking for lib lua") -if(HAVE_LUA51_LIB) -message(STATUS "Looking for lib lua - found") -message(STATUS "Lib lua version: ${LIB_LUA_NAME}") -else(HAVE_LUA51_LIB) -message(STATUS "Looking for lib lua - not found") -endif(HAVE_LUA51_LIB) +endif(LUA_INCLUDE_DIR) if(HAVE_LUA_BIN) message(STATUS "Found Lua: ${HAVE_LUA_BIN}") endif(HAVE_LUA_BIN) +set(LIB_LUA_NAME "") + +foreach(lib_path ${LUA_LIBRARIES}) + if(NOT LIB_LUA_NAME) + string(REGEX MATCH "liblua.*$" LIB_LUA_NAME "${lib_path}") + string(REPLACE ".${LIB_EXE}" "" LIB_LUA_NAME "${LIB_LUA_NAME}") + string(REPLACE "lib" "" LIB_LUA_NAME "${LIB_LUA_NAME}") + if(LIB_LUA_NAME) + string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${lib_path}) + endif(LIB_LUA_NAME) + endif(NOT LIB_LUA_NAME) +endforeach(lib_path ${LUA_LIBRARIES}) + +message(STATUS "Looking for lib lua") +if(LUA_LIBRARY_DIR) +message(STATUS "Looking for lib lua - found") +message(STATUS "Lua version: ${LIB_LUA_NAME}") +message(STATUS "Lib path : ${LUA_LIBRARY_DIR}") +else(LUA_LIBRARY_DIR) +message(STATUS "Looking for lib lua - not found") +endif(LUA_LIBRARY_DIR) + if(LUA51_FOUND) set(HAVE_LUA 1) include_directories(${LUA_INCLUDE_DIR}) -- 2.20.1