diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 13:50:14 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 14:19:16 -0400 |
| commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
| tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Utilities/CMakeLists.txt | |
| parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
| download | cmake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz | |
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 'Utilities/CMakeLists.txt')
| -rw-r--r-- | Utilities/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 98c1cfdf5f..c39be8ba8c 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -68,8 +68,8 @@ macro(ADD_DOCS target dependency) ${CMake_BINARY_DIR}/Docs/${target}.docbook ) list(APPEND HTML_FILES ${CMake_BINARY_DIR}/Docs/${target}.html) - endif(CMD) -endmacro(ADD_DOCS target dependency) + endif() +endmacro() # Help cmake-gui find the Qt DLLs on Windows. set(WIN_SHELL_GENS "Visual Studio|NMake|MinGW|Watcom|Borland") @@ -80,7 +80,7 @@ if(BUILD_QtDialog AND "${CMAKE_GENERATOR}" MATCHES "${WIN_SHELL_GENS}" # Tell the macro to set the path before running cmake-gui. string(REPLACE ";" "\\;" _PATH "PATH=${Qt_BIN_DIR};%PATH%") set(cmake-gui-PATH COMMAND set "${_PATH}") - endif(EXISTS "${Qt_BIN_DIR}/QtCore4.dll") + endif() endif(BUILD_QtDialog AND "${CMAKE_GENERATOR}" MATCHES "${WIN_SHELL_GENS}" AND EXISTS "${QT_QMAKE_EXECUTABLE}" AND NOT CMAKE_NO_AUTO_QT_ENV) |