diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:50:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
| commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
| tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/FindLua50.cmake | |
| parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
| download | CMake-9db3116226cb99fcf54e936c833953abcde9b729.zip CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.bz2 | |
Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Modules/FindLua50.cmake')
| -rw-r--r-- | Modules/FindLua50.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake index cfe2e72..2b8ee97 100644 --- a/Modules/FindLua50.cmake +++ b/Modules/FindLua50.cmake @@ -55,7 +55,7 @@ find_library(LUA_LIBRARY_lua # (like GLU in OpenGL.framework) if(${LUA_LIBRARY_lua} MATCHES "framework") set( LUA_LIBRARIES "${LUA_LIBRARY_lua}" CACHE STRING "Lua framework") -else(${LUA_LIBRARY_lua} MATCHES "framework") +else() find_library(LUA_LIBRARY_lualib NAMES lualib50 lualib5.0 lualib5 lualib HINTS @@ -74,11 +74,11 @@ else(${LUA_LIBRARY_lua} MATCHES "framework") find_library(MATH_LIBRARY_FOR_LUA m) set( LUA_LIBRARIES "${LUA_LIBRARY_lualib};${LUA_LIBRARY_lua};${MATH_LIBRARY_FOR_LUA}" CACHE STRING "This is the concatentation of lua and lualib libraries") # For Windows and Mac, don't need to explicitly include the math library - else(UNIX AND NOT APPLE) + else() set( LUA_LIBRARIES "${LUA_LIBRARY_lualib};${LUA_LIBRARY_lua}" CACHE STRING "This is the concatentation of lua and lualib libraries") - endif(UNIX AND NOT APPLE) - endif(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua) -endif(${LUA_LIBRARY_lua} MATCHES "framework") + endif() + endif() +endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) |