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 /Modules/CMakeExportBuildSettings.cmake | |
| 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 'Modules/CMakeExportBuildSettings.cmake')
| -rw-r--r-- | Modules/CMakeExportBuildSettings.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeExportBuildSettings.cmake b/Modules/CMakeExportBuildSettings.cmake index 7392e6beca..a18f950623 100644 --- a/Modules/CMakeExportBuildSettings.cmake +++ b/Modules/CMakeExportBuildSettings.cmake @@ -30,7 +30,7 @@ macro(CMAKE_EXPORT_BUILD_SETTINGS SETTINGS_FILE) if(${SETTINGS_FILE} MATCHES ".+") configure_file(${CMAKE_ROOT}/Modules/CMakeBuildSettings.cmake.in ${SETTINGS_FILE} @ONLY IMMEDIATE) - else(${SETTINGS_FILE} MATCHES ".+") + else() message(SEND_ERROR "CMAKE_EXPORT_BUILD_SETTINGS called with no argument.") - endif(${SETTINGS_FILE} MATCHES ".+") -endmacro(CMAKE_EXPORT_BUILD_SETTINGS) + endif() +endmacro() |
