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/SubDirSpaces/CMakeLists.txt | |
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/SubDirSpaces/CMakeLists.txt')
-rw-r--r-- | Tests/SubDirSpaces/CMakeLists.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Tests/SubDirSpaces/CMakeLists.txt b/Tests/SubDirSpaces/CMakeLists.txt index f1ace0f..69f1d68 100644 --- a/Tests/SubDirSpaces/CMakeLists.txt +++ b/Tests/SubDirSpaces/CMakeLists.txt @@ -4,7 +4,7 @@ project(SUBDIR) # Some systems do not seem to support rpath with spaces. if("${CMAKE_SYSTEM}" MATCHES "IRIX|QNX") set(CMAKE_SKIP_BUILD_RPATH 1) -endif("${CMAKE_SYSTEM}" MATCHES "IRIX|QNX") +endif() # be able to see output from make on dashboards set(CMAKE_VERBOSE_MAKEFILE 1) @@ -26,9 +26,9 @@ endif() if(CMAKE_PAREN) add_definitions(-DCMAKE_PAREN=1) subdirs("Executable Sources" "Some(x86) Sources" EXCLUDE_FROM_ALL "Some Examples") -else(CMAKE_PAREN) +else() subdirs("Executable Sources" EXCLUDE_FROM_ALL "Some Examples") -endif(CMAKE_PAREN) +endif() write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.") #WATCOM WMAKE does not support + in the name of a file! @@ -36,11 +36,11 @@ if(WATCOM) set(PLUS_NAME_FILES "Another Subdir/pair_int.int.c" vcl_algorithm_vcl_pair_double.foo.c) -else(WATCOM) +else() set(PLUS_NAME_FILES "Another Subdir/pair+int.int.c" vcl_algorithm+vcl_pair+double.foo.c) -endif(WATCOM) +endif() add_executable(TestFromSubdir "Another Subdir/testfromsubdir.c" @@ -52,26 +52,26 @@ 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}) - 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() add_executable(TestWithAuxSourceDir ${SOURCES}) if(CMAKE_PAREN) target_link_libraries(TestWithAuxSourceDir testOddPath) -endif(CMAKE_PAREN) +endif() |