diff options
| -rw-r--r-- | CMake/Modules/FindLua.cmake | 46 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
2 files changed, 5 insertions, 51 deletions
diff --git a/CMake/Modules/FindLua.cmake b/CMake/Modules/FindLua.cmake deleted file mode 100644 index 6a2f8e42..00000000 --- a/CMake/Modules/FindLua.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# Find the Lua 5.1 includes and library -# -# LUA_INCLUDE_DIR - where to find lua.h -# LUA_LIBRARIES - List of fully qualified libraries to link against -# LUA_FOUND - Set to TRUE if found - -IF(LUA_INCLUDE_DIR AND LUA_LIBRARIES) - SET(LUA_FIND_QUIETLY TRUE) -ENDIF(LUA_INCLUDE_DIR AND LUA_LIBRARIES) - -# for Windows we rely on the environement variables -# %INCLUDE% and %LIB%; FIND_LIBRARY checks %LIB% -# automatically on Windows -IF(WIN32) - FIND_PATH(LUA_INCLUDE_DIR lua/lua.h - $ENV{INCLUDE} - ) - FIND_LIBRARY(LUA_LIBRARIES - NAMES lua - ) -ELSE() - FIND_PATH(LUA_INCLUDE_DIR lua.h ) - - FIND_LIBRARY(LUA_LIBRARIES NAMES lua ) -ENDIF() - -IF(LUA_INCLUDE_DIR AND LUA_LIBRARIES) - SET(LUA_FOUND TRUE) - INCLUDE(CheckLibraryExists) - CHECK_LIBRARY_EXISTS(${LUA_LIBRARIES} lua_close "" LUA_NEED_PREFIX) -ELSE(LUA_INCLUDE_DIR AND LUA_LIBRARIES) - SET(LUA_FOUND FALSE) -ENDIF (LUA_INCLUDE_DIR AND LUA_LIBRARIES) - -IF(LUA_FOUND) - IF (NOT LUA_FIND_QUIETLY) - MESSAGE(STATUS "Found Lua library: ${LUA_LIBRARIES}") - MESSAGE(STATUS "Found Lua headers: ${LUA_INCLUDE_DIR}") - ENDIF (NOT LUA_FIND_QUIETLY) -ELSE(LUA_FOUND) - IF(LUA_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could NOT find Lua") - ENDIF(LUA_FIND_REQUIRED) -ENDIF(LUA_FOUND) - -MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30a4c43e..6e96cb35 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,11 +39,11 @@ IF (WITH_POSTGRESQL) ENDIF() # If the Lua scripting language support is enabled... -#IF (ENABLE_LUA) -# FIND_PACKAGE(Lua REQUIRED) - # INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR}) - # SET(FLAGS "${FLAGS} -DBUILD_LUA") -# #ENDIF() +IF (ENABLE_LUA) + FIND_PACKAGE(Lua51 REQUIRED) + INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR}) + SET(FLAGS "${FLAGS} -DBUILD_LUA") +ENDIF() IF (CMAKE_BUILD_TYPE) STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) |