summaryrefslogtreecommitdiffstats
path: root/Tests/CPackComponents
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2012-08-13 17:50:14 (GMT)
committerBrad King <brad.king@kitware.com>2012-08-13 18:19:16 (GMT)
commit9db3116226cb99fcf54e936c833953abcde9b729 (patch)
treebd755ed9e616bbf1482a894bc7946980d81b7703 /Tests/CPackComponents
parent77543bde41b0e52c3959016698b529835945d62d (diff)
downloadCMake-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/CPackComponents')
-rw-r--r--Tests/CPackComponents/VerifyResult.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/Tests/CPackComponents/VerifyResult.cmake b/Tests/CPackComponents/VerifyResult.cmake
index 850ec00..c7c24fd 100644
--- a/Tests/CPackComponents/VerifyResult.cmake
+++ b/Tests/CPackComponents/VerifyResult.cmake
@@ -4,7 +4,7 @@ message(STATUS "")
if(NOT CPackComponents_BINARY_DIR)
message(FATAL_ERROR "CPackComponents_BINARY_DIR not set")
-endif(NOT CPackComponents_BINARY_DIR)
+endif()
set(expected_file_mask "")
@@ -18,15 +18,15 @@ if(WIN32)
)
if(NSIS_MAKENSIS_EXECUTABLE)
set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.exe")
- endif(NSIS_MAKENSIS_EXECUTABLE)
-endif(WIN32)
+ endif()
+endif()
if(APPLE)
# Always expect the *.dmg installer - PackageMaker should always
# be installed on a development Mac:
#
set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.dmg")
-endif(APPLE)
+endif()
if(expected_file_mask)
set(expected_count 1)
@@ -38,11 +38,11 @@ if(expected_file_mask)
if(NOT expected_file)
message(FATAL_ERROR "error: expected_file does not exist: CPackComponents test fails.")
- endif(NOT expected_file)
+ endif()
list(LENGTH expected_file actual_count)
message(STATUS "actual_count='${actual_count}'")
if(NOT actual_count EQUAL expected_count)
message(FATAL_ERROR "error: expected_count does not match actual_count: CPackComponents test fails.")
- endif(NOT actual_count EQUAL expected_count)
-endif(expected_file_mask)
+ endif()
+endif()