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/OutOfSource | |
| 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/OutOfSource')
| -rw-r--r-- | Tests/OutOfSource/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tests/OutOfSource/CMakeLists.txt b/Tests/OutOfSource/CMakeLists.txt index 420310f..de1603a 100644 --- a/Tests/OutOfSource/CMakeLists.txt +++ b/Tests/OutOfSource/CMakeLists.txt @@ -8,7 +8,7 @@ get_directory_property(ANIMAL DIRECTORY OutOfSourceSubdir DEFINITION WEASELS) get_directory_property(ANIMALREL DIRECTORY SubDir/../OutOfSourceSubdir DEFINITION WEASELS) if(NOT "${ANIMAL}" STREQUAL "${ANIMALREL}") message(FATAL_ERROR "GET_DIRECTORY_PROPERTY does not seem to collapse paths.") -endif(NOT "${ANIMAL}" STREQUAL "${ANIMALREL}") +endif() configure_file( ${OutOfSource_SOURCE_DIR}/testdp.h.in diff --git a/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt b/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt index d418809..10a2f59 100644 --- a/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt +++ b/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt @@ -36,7 +36,7 @@ if ("${PROJECT_SOURCE_DIR}" STREQUAL "${ANOTHER_PROJ_SOURCE_DIR}") while("${DEEPDIR_LEN}" LESS "${MAXPATH}") set(DEEPDIR ${DEEPDIR}/and/deeper) string(LENGTH "${DEEPDIR}" DEEPDIR_LEN) - endwhile("${DEEPDIR_LEN}" LESS "${MAXPATH}") + endwhile() set(DEEPSRC ${DEEPDIR}/simple.cxx) string(LENGTH "${DEEPSRC}" DEEPSRC_LEN) configure_file(simple.cxx.in ${DEEPSRC} COPYONLY) @@ -46,12 +46,12 @@ if ("${PROJECT_SOURCE_DIR}" STREQUAL "${ANOTHER_PROJ_SOURCE_DIR}") if(${CMAKE_GENERATOR} MATCHES "Watcom WMake") set(DEEPSRC "") add_definitions(-DNO_DEEPSRC) - endif(${CMAKE_GENERATOR} MATCHES "Watcom WMake") + endif() add_library(testlib testlib.cxx) add_executable (simple simple.cxx ../simple.cxx ${DEEPSRC}) target_link_libraries(simple testlib outlib) -endif ("${PROJECT_SOURCE_DIR}" STREQUAL "${ANOTHER_PROJ_SOURCE_DIR}") +endif () # test getting a definition from a subdir set (WEASELS SIZZLING) @@ -59,4 +59,4 @@ set (WEASELS SIZZLING) get_directory_property(incDirs INCLUDE_DIRECTORIES) if(NOT incDirs) message(FATAL_ERROR "get_directory_property(INCLUDE_DIRECTORIES) returned empty list") -endif(NOT incDirs) +endif() |