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/SimpleInstallS2/InstallScript4.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 'Tests/SimpleInstallS2/InstallScript4.cmake')
| -rw-r--r-- | Tests/SimpleInstallS2/InstallScript4.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Tests/SimpleInstallS2/InstallScript4.cmake b/Tests/SimpleInstallS2/InstallScript4.cmake index 0bbd9d2..34d0a73 100644 --- a/Tests/SimpleInstallS2/InstallScript4.cmake +++ b/Tests/SimpleInstallS2/InstallScript4.cmake @@ -1,21 +1,21 @@ message("This is install script 4.") if(INSTALL_SCRIPT_3_DID_RUN) message("Install script ordering works.") -else(INSTALL_SCRIPT_3_DID_RUN) +else() message(FATAL_ERROR "Install script 3 did not run before install script 4.") -endif(INSTALL_SCRIPT_3_DID_RUN) +endif() if(INSTALL_CODE_WITH_COMPONENT_DID_RUN) message("Install code ordering works.") -else(INSTALL_CODE_WITH_COMPONENT_DID_RUN) +else() message(FATAL_ERROR "Install script 4 did not run after install with component code.") -endif(INSTALL_CODE_WITH_COMPONENT_DID_RUN) +endif() if(CMAKE_INSTALL_COMPONENT) if(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development") message("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"") message(FATAL_ERROR "Install script 4 should only run for \"Development\" INSTALL COMPONENT.") -endif(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development") -endif(CMAKE_INSTALL_COMPONENT) +endif() +endif() file(WRITE "${CMAKE_INSTALL_PREFIX}/MyTest/InstallScript4Out.cmake" "set(CMAKE_INSTALL_SCRIPT_4_DID_RUN 1)\n" |