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/CMakeBackwardCompatibilityC.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/CMakeBackwardCompatibilityC.cmake')
| -rw-r--r-- | Modules/CMakeBackwardCompatibilityC.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/CMakeBackwardCompatibilityC.cmake b/Modules/CMakeBackwardCompatibilityC.cmake index 90ad12e..e3b6c82 100644 --- a/Modules/CMakeBackwardCompatibilityC.cmake +++ b/Modules/CMakeBackwardCompatibilityC.cmake @@ -16,11 +16,11 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 7") include(CMakeVS7BackwardCompatibility) set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -endif(CMAKE_GENERATOR MATCHES "Visual Studio 7") +endif() if(CMAKE_GENERATOR MATCHES "Visual Studio 6") include(CMakeVS6BackwardCompatibility) set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -endif(CMAKE_GENERATOR MATCHES "Visual Studio 6") +endif() if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) # Old CMake versions did not support OS X universal binaries anyway, @@ -57,10 +57,10 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) if("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") set (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.") - else("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") + else() set (CMAKE_X_CFLAGS "-I${X11_X11_INCLUDE_PATH}" CACHE STRING "X11 extra flags.") - endif("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") + endif() set (CMAKE_X_LIBS "${X11_LIBRARIES}" CACHE STRING "Libraries and options used in X11 programs.") set (CMAKE_HAS_X "${X11_FOUND}" CACHE INTERNAL "Is X11 around.") @@ -86,7 +86,7 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) set(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) endif() -endif(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) +endif() mark_as_advanced( CMAKE_HP_PTHREADS |