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 /Tests/BundleTest | |
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 'Tests/BundleTest')
-rw-r--r-- | Tests/BundleTest/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tests/BundleTest/CMakeLists.txt b/Tests/BundleTest/CMakeLists.txt index 4fb65bfa6b..de69d75558 100644 --- a/Tests/BundleTest/CMakeLists.txt +++ b/Tests/BundleTest/CMakeLists.txt @@ -61,7 +61,7 @@ set_target_properties(BundleTest PROPERTIES OUTPUT_NAME BundleTestExe) # Test executable versioning if it is supported. if(NOT XCODE) set_target_properties(BundleTest PROPERTIES VERSION 1) -endif(NOT XCODE) +endif() # Make sure the executable can find its installed library. set_target_properties(BundleTestLib PROPERTIES @@ -77,26 +77,26 @@ if(EXISTS /usr/lib/libtcl.dylib message("frame: ${TCL}") if(NOT "${TCL}" MATCHES .framework) message(FATAL_ERROR "Could not find tcl framework, found ${TCL}") - endif(NOT "${TCL}" MATCHES .framework) + endif() set(TCL NOTFOUND) set(CMAKE_FIND_FRAMEWORK LAST) find_library(TCL tcl) if("${TCL}" MATCHES .framework) message(FATAL_ERROR "Found framework and should have found dylib ${TCL}") - endif("${TCL}" MATCHES .framework) + endif() set(TCL NOTFOUND) set(CMAKE_FIND_FRAMEWORK NEVER) find_library(TCL tcl) if("${TCL}" MATCHES .framework) message(FATAL_ERROR "Found framework and should have found dylib ${TCL}") - endif("${TCL}" MATCHES .framework) + endif() message("not frame: ${TCL}") set(TCL NOTFOUND) set(CMAKE_FIND_FRAMEWORK FIRST) find_library(TCL tcl) if(NOT "${TCL}" MATCHES .framework) message(FATAL_ERROR "Could not find tcl framework, found ${TCL}") - endif(NOT "${TCL}" MATCHES .framework) + endif() message("frame: ${TCL}") endif(EXISTS /usr/lib/libtcl.dylib AND EXISTS /System/Library/Frameworks/Tcl.framework) |