# HG changeset patch # User smxx # Date 1269776046 0 # Node ID 430c1e96c80fbf0980e0a2d015fcb020b3e8fce5 # Parent 1ab5f18f4df8f7713c3def58f1e064be858a0113 CMake: * Run FindLua every time, even if LUA_LIBRARY is already set diff -r 1ab5f18f4df8 -r 430c1e96c80f cmake_modules/FindLua.cmake --- a/cmake_modules/FindLua.cmake Sun Mar 28 02:49:39 2010 +0000 +++ b/cmake_modules/FindLua.cmake Sun Mar 28 11:34:06 2010 +0000 @@ -1,23 +1,21 @@ # Find the Lua library # -IF(NOT LUA_LIBRARY) - 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!") - ENDIF() - #remove the path (fpc doesn't like it - why?) - GET_FILENAME_COMPONENT(LUA_DEFAULT ${LUA_DEFAULT} NAME) - ENDIF(APPLE) - ENDIF(WIN32) - SET(LUA_LIBRARY ${LUA_DEFAULT} CACHE STRING "Lua library to link to; file name without path only!") - UNSET(LUA_DEFAULT) -ENDIF(NOT LUA_LIBRARY) \ No newline at end of file +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!") + ENDIF() + #remove the path (fpc doesn't like it - why?) + GET_FILENAME_COMPONENT(LUA_DEFAULT ${LUA_DEFAULT} NAME) + ENDIF(APPLE) +ENDIF(WIN32) +SET(LUA_LIBRARY ${LUA_DEFAULT} CACHE STRING "Lua library to link to; file name without path only!") +UNSET(LUA_DEFAULT)