# HG changeset patch # User koda # Date 1336687861 -7200 # Node ID 91199321e916d945851701033efc6adbc7c63fb5 # Parent 35d762458d66bbec9f7f22246021d3a93f1b87b3 fix building with lua (i think) diff -r 35d762458d66 -r 91199321e916 CMakeLists.txt --- a/CMakeLists.txt Fri May 11 00:05:47 2012 +0200 +++ b/CMakeLists.txt Fri May 11 00:11:01 2012 +0200 @@ -190,6 +190,7 @@ find_package(Lua) if(NOT ${LUA_FOUND}) + message(STATUS "Lua library not found, building bundled dependency") add_subdirectory(misc/liblua) #link with liblua.a (which requires readline) set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/liblua.a" "-k-lreadline" ${pascal_compiler_flags_cmn}) diff -r 35d762458d66 -r 91199321e916 cmake_modules/FindLua.cmake --- a/cmake_modules/FindLua.cmake Fri May 11 00:05:47 2012 +0200 +++ b/cmake_modules/FindLua.cmake Fri May 11 00:11:01 2012 +0200 @@ -5,31 +5,30 @@ # On Linux it will try to load the system library and fallback to compiling # the bundled one when nothing is found -set(LUA_FOUND true) +set(LUA_FOUND false) if (ANDROID) - SET(LUA_DEFAULT "liblua5.1.so") + SET(LUA_DEFAULT "liblua5.1.so") else (ANDROID) - IF(WIN32) - SET(LUA_DEFAULT lua.dll) - ELSE(WIN32) - IF(APPLE) - SET(LUA_DEFAULT lua) - ELSE(APPLE) - #locate the system's lua library - FIND_LIBRARY(LUA_DEFAULT NAMES lua51 lua5.1 lua-5.1 lua PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib) - IF(${LUA_DEFAULT} MATCHES "LUA_DEFAULT-NOTFOUND") - #UNSET(LUA_DEFAULT) - #MESSAGE(FATAL_ERROR "Couldn't find Lua 5.1 library!") - set(LUA_DEFAULT lua) - set(LUA_FOUND false) - ELSE() - message(STATUS "LibLua 5.1 found at ${LUA_DEFAULT}") - #remove the path (fpc doesn't like it - why?) - GET_FILENAME_COMPONENT(LUA_DEFAULT ${LUA_DEFAULT} NAME) - ENDIF() - ENDIF(APPLE) - ENDIF(WIN32) + IF(WIN32) + SET(LUA_DEFAULT lua.dll) + ELSE(WIN32) + IF(APPLE) + SET(LUA_DEFAULT lua) + ELSE(APPLE) + #locate the system's lua library + FIND_LIBRARY(LUA_DEFAULT NAMES lua51 lua5.1 lua-5.1 lua PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib) + IF(${LUA_DEFAULT} MATCHES "LUA_DEFAULT-NOTFOUND") + set(LUA_DEFAULT lua) + set(LUA_FOUND true) + ELSE() + message(STATUS "LibLua 5.1 found at ${LUA_DEFAULT}") + #remove the path (fpc doesn't like it - why?) + GET_FILENAME_COMPONENT(LUA_DEFAULT ${LUA_DEFAULT} NAME) + ENDIF() + ENDIF(APPLE) + ENDIF(WIN32) ENDIF(ANDROID) + SET(LUA_LIBRARY ${LUA_DEFAULT} CACHE STRING "Lua library to link to; file name without path only!") -#UNSET(LUA_DEFAULT) +