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/Jump | |
| 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/Jump')
| -rw-r--r-- | Tests/Jump/Executable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Jump/Library/Shared/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tests/Jump/Executable/CMakeLists.txt b/Tests/Jump/Executable/CMakeLists.txt index a09bac7..bc6731f 100644 --- a/Tests/Jump/Executable/CMakeLists.txt +++ b/Tests/Jump/Executable/CMakeLists.txt @@ -1,6 +1,6 @@ if(NOT LIBRARY_OUTPUT_PATH) link_directories(${Jump_BINARY_DIR}/Library/Static ${Jump_BINARY_DIR}/Library/Shared) -endif(NOT LIBRARY_OUTPUT_PATH) +endif() add_executable(jumpExecutable jumpExecutable.cxx) target_link_libraries(jumpExecutable jumpStatic jumpShared) diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt index 87d40e5..a37299a 100644 --- a/Tests/Jump/Library/Shared/CMakeLists.txt +++ b/Tests/Jump/Library/Shared/CMakeLists.txt @@ -6,7 +6,7 @@ endif() if(APPLE) set(SHARED_MUST_BE_IN_EXE_DIR 1) -endif(APPLE) +endif() if(SHARED_MUST_BE_IN_EXE_DIR) set(LIB_NAME @@ -14,13 +14,13 @@ if(SHARED_MUST_BE_IN_EXE_DIR) set(EXE_DIR ${Jump_BINARY_DIR}/Executable) if(EXECUTABLE_OUTPUT_PATH) set(EXE_DIR ${EXECUTABLE_OUTPUT_PATH}) - endif(EXECUTABLE_OUTPUT_PATH) + endif() set(LIB_DIR ${Jump_BINARY_DIR}/Library/Shared) if(LIBRARY_OUTPUT_PATH) set(LIB_DIR ${LIBRARY_OUTPUT_PATH}) - endif(LIBRARY_OUTPUT_PATH) + endif() add_custom_command(TARGET jumpShared POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME} ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}) -endif(SHARED_MUST_BE_IN_EXE_DIR) +endif() |