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 /Modules/SystemInformation.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 'Modules/SystemInformation.cmake')
| -rw-r--r-- | Modules/SystemInformation.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Modules/SystemInformation.cmake b/Modules/SystemInformation.cmake index 73674e6..fa85071 100644 --- a/Modules/SystemInformation.cmake +++ b/Modules/SystemInformation.cmake @@ -32,7 +32,7 @@ file(APPEND "${RESULT_FILE}" get_cmake_property(res VARIABLES) foreach(var ${res}) file(APPEND "${RESULT_FILE}" "${var} \"${${var}}\"\n") -endforeach(var ${res}) +endforeach() file(APPEND "${RESULT_FILE}" "\n=================================================================\n") @@ -43,7 +43,7 @@ file(APPEND "${RESULT_FILE}" get_cmake_property(res COMMANDS) foreach(var ${res}) file(APPEND "${RESULT_FILE}" "${var}\n") -endforeach(var ${res}) +endforeach() file(APPEND "${RESULT_FILE}" "\n=================================================================\n") @@ -55,7 +55,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/AllMacros.txt "") get_cmake_property(res MACROS) foreach(var ${res}) file(APPEND "${RESULT_FILE}" "${var}\n") -endforeach(var ${res}) +endforeach() file(APPEND "${RESULT_FILE}" "\n=================================================================\n") @@ -66,12 +66,12 @@ file(APPEND "${RESULT_FILE}" get_directory_property(res INCLUDE_DIRECTORIES) foreach(var ${res}) file(APPEND "${RESULT_FILE}" "INCLUDE_DIRECTORY: ${var}\n") -endforeach(var) +endforeach() get_directory_property(res LINK_DIRECTORIES) foreach(var ${res}) file(APPEND "${RESULT_FILE}" "LINK_DIRECTORIES: ${var}\n") -endforeach(var) +endforeach() get_directory_property(res INCLUDE_REGULAR_EXPRESSION) file(APPEND "${RESULT_FILE}" "INCLUDE_REGULAR_EXPRESSION: ${res}\n") @@ -89,8 +89,8 @@ macro(DUMP_FILE THE_FILE) file(READ "${THE_FILE}" FILE_CONTENTS LIMIT 50000) file(APPEND "${RESULT_FILE}" "${FILE_CONTENTS}") - endif (EXISTS "${THE_FILE}") -endmacro(DUMP_FILE) + endif () +endmacro() DUMP_FILE("../CMakeCache.txt") DUMP_FILE("../CMakeFiles/CMakeOutput.log") @@ -99,5 +99,5 @@ DUMP_FILE("../CMakeFiles/CMakeSystem.cmake") foreach (EXTRA_FILE ${EXTRA_DUMP_FILES}) DUMP_FILE("${EXTRA_FILE}") -endforeach (EXTRA_FILE) +endforeach () |