diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 13:50:14 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 14:19:16 -0400 |
| commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
| tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Tests/SubDir | |
| parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
| download | cmake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz | |
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/SubDir')
| -rw-r--r-- | Tests/SubDir/CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt index 2aec956359..6822e6bd9a 100644 --- a/Tests/SubDir/CMakeLists.txt +++ b/Tests/SubDir/CMakeLists.txt @@ -7,11 +7,11 @@ if(WATCOM) set(PLUS_NAME_FILES AnotherSubdir/pair_int.int.c vcl_algorithm_vcl_pair_double.foo.c) -else(WATCOM) +else() set(PLUS_NAME_FILES AnotherSubdir/pair+int.int.c vcl_algorithm+vcl_pair+double.foo.c) -endif(WATCOM) +endif() add_executable(TestFromSubdir AnotherSubdir/testfromsubdir.c @@ -23,24 +23,24 @@ aux_source_directory(ThirdSubDir SOURCES) if(WATCOM) foreach(f ${SOURCES}) if("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c") - else("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c") + else() set(SOURCES2 ${f} ${SOURCES2}) - endif("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c") - endforeach(f) + endif() + endforeach() set(SOURCES ${SOURCES2}) set(SOURCES ${SOURCES} vcl_algorithm_vcl_pair_double.foo.c) -else(WATCOM) +else() foreach(f ${SOURCES}) if("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c") - else("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c") + else() set(SOURCES2 ${f} ${SOURCES2}) message("${f}") - endif("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c") - endforeach(f) + endif() + endforeach() set(SOURCES ${SOURCES2}) set(SOURCES ${SOURCES} vcl_algorithm+vcl_pair+double.foo.c) -endif(WATCOM) +endif() message("Sources: ${SOURCES}") add_executable(TestWithAuxSourceDir ${SOURCES}) |
