summaryrefslogtreecommitdiffstats
path: root/Modules/CTestTargets.cmake
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 /Modules/CTestTargets.cmake
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 'Modules/CTestTargets.cmake')
-rw-r--r--Modules/CTestTargets.cmake18
1 files changed, 9 insertions, 9 deletions
diff --git a/Modules/CTestTargets.cmake b/Modules/CTestTargets.cmake
index 15be42d..fd4bd80 100644
--- a/Modules/CTestTargets.cmake
+++ b/Modules/CTestTargets.cmake
@@ -14,7 +14,7 @@
if(NOT RUN_FROM_CTEST_OR_DART)
message(FATAL_ERROR "Do not incldue CTestTargets.cmake directly")
-endif(NOT RUN_FROM_CTEST_OR_DART)
+endif()
# make directories in the binary tree
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Testing/Temporary)
@@ -30,11 +30,11 @@ if(CTEST_NEW_FORMAT)
configure_file(
${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in
${PROJECT_BINARY_DIR}/CTestConfiguration.ini )
-else(CTEST_NEW_FORMAT)
+else()
configure_file(
${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in
${PROJECT_BINARY_DIR}/DartConfiguration.tcl )
-endif(CTEST_NEW_FORMAT)
+endif()
#
# Section 3:
@@ -47,7 +47,7 @@ set(__conf_types "")
if(CMAKE_CONFIGURATION_TYPES)
# We need to pass the configuration type on the test command line.
set(__conf_types -C "${CMAKE_CFG_INTDIR}")
-endif(CMAKE_CONFIGURATION_TYPES)
+endif()
# Add convenience targets. Do this at most once in case of nested
# projects.
@@ -66,7 +66,7 @@ if(NOT _CTEST_TARGETS_ADDED)
)
set_property(TARGET ${mode} PROPERTY RULE_LAUNCH_CUSTOM "")
set_property(TARGET ${mode} PROPERTY FOLDER "CTestDashboardTargets")
- endforeach(mode)
+ endforeach()
# For Makefile generators add more granular targets.
if("${CMAKE_GENERATOR}" MATCHES "(Ninja|Make)")
@@ -81,9 +81,9 @@ if(NOT _CTEST_TARGETS_ADDED)
)
set_property(TARGET ${mode}${testtype} PROPERTY RULE_LAUNCH_CUSTOM "")
set_property(TARGET ${mode}${testtype} PROPERTY FOLDER "CTestDashboardTargets")
- endforeach(testtype)
- endforeach(mode)
- endif("${CMAKE_GENERATOR}" MATCHES "(Ninja|Make)")
+ endforeach()
+ endforeach()
+ endif()
# If requested, add an alias that is the equivalent of the built-in "test"
# or "RUN_TESTS" target:
@@ -92,4 +92,4 @@ if(NOT _CTEST_TARGETS_ADDED)
${CMAKE_CTEST_COMMAND} ${__conf_types}
)
endif()
-endif(NOT _CTEST_TARGETS_ADDED)
+endif()