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 /Tests/EnforceConfig.cmake.in | |
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 'Tests/EnforceConfig.cmake.in')
-rw-r--r-- | Tests/EnforceConfig.cmake.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tests/EnforceConfig.cmake.in b/Tests/EnforceConfig.cmake.in index 27ee1fd..8c0817c 100644 --- a/Tests/EnforceConfig.cmake.in +++ b/Tests/EnforceConfig.cmake.in @@ -1,9 +1,9 @@ # Choose a configuration with which to drive CTest tests. if(CTEST_CONFIGURATION_TYPE) set(CTestTest_CONFIG "${CTEST_CONFIGURATION_TYPE}") -else(CTEST_CONFIGURATION_TYPE) +else() set(CTestTest_CONFIG "@CTestTest_CONFIG@") -endif(CTEST_CONFIGURATION_TYPE) +endif() # Choose a configuration that was built if none is given. if(NOT CTEST_CONFIGURATION_TYPE) @@ -14,13 +14,13 @@ if(NOT CTEST_CONFIGURATION_TYPE) if(NOT CTEST_CONFIGURATION_TYPE) if(EXISTS "${CTEST_DIR}/${cfg}/${CTEST_EXE}") set(CTEST_CONFIGURATION_TYPE ${cfg}) - endif(EXISTS "${CTEST_DIR}/${cfg}/${CTEST_EXE}") - endif(NOT CTEST_CONFIGURATION_TYPE) - endforeach(cfg) + endif() + endif() + endforeach() if(NOT CTEST_CONFIGURATION_TYPE) set(CTEST_CONFIGURATION_TYPE NoConfig) - endif(NOT CTEST_CONFIGURATION_TYPE) + endif() message("Guessing configuration ${CTEST_CONFIGURATION_TYPE}") -endif(NOT CTEST_CONFIGURATION_TYPE) +endif() @TEST_HOME_ENV_CODE@ |