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/CMakeBackwardCompatibilityCXX.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/CMakeBackwardCompatibilityCXX.cmake')
| -rw-r--r-- | Modules/CMakeBackwardCompatibilityCXX.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/CMakeBackwardCompatibilityCXX.cmake b/Modules/CMakeBackwardCompatibilityCXX.cmake index 6888636..cfc1d91 100644 --- a/Modules/CMakeBackwardCompatibilityCXX.cmake +++ b/Modules/CMakeBackwardCompatibilityCXX.cmake @@ -26,10 +26,10 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) set(CMAKE_TRY_ANSI_CXX_FLAGS "") if(CMAKE_SYSTEM MATCHES "IRIX.*") set(CMAKE_TRY_ANSI_CXX_FLAGS "-LANG:std") - endif(CMAKE_SYSTEM MATCHES "IRIX.*") + endif() if(CMAKE_SYSTEM MATCHES "OSF.*") set(CMAKE_TRY_ANSI_CXX_FLAGS "-std strict_ansi -nopure_cname") - endif(CMAKE_SYSTEM MATCHES "OSF.*") + endif() # if CMAKE_TRY_ANSI_CXX_FLAGS has something in it, see # if the compiler accepts it if( CMAKE_TRY_ANSI_CXX_FLAGS MATCHES ".+") @@ -39,9 +39,9 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) if(CMAKE_CXX_ACCEPTS_FLAGS) set(CMAKE_ANSI_CXXFLAGS ${CMAKE_TRY_ANSI_CXX_FLAGS} CACHE INTERNAL "What flags are required by the c++ compiler to make it ansi." ) - endif(CMAKE_CXX_ACCEPTS_FLAGS) - endif( CMAKE_TRY_ANSI_CXX_FLAGS MATCHES ".+") - endif(NOT CMAKE_COMPILER_IS_GNUCXX) + endif() + endif() + endif() set(CMAKE_CXX_FLAGS_SAVE ${CMAKE_CXX_FLAGS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}") include(TestForANSIStreamHeaders) @@ -50,5 +50,5 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) include(TestForANSIForScope) include(TestForSSTREAM) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_SAVE}") -endif(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) +endif() |