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 /CompileFlags.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 'CompileFlags.cmake')
| -rw-r--r-- | CompileFlags.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CompileFlags.cmake b/CompileFlags.cmake index f144337..b2044e4 100644 --- a/CompileFlags.cmake +++ b/CompileFlags.cmake @@ -15,10 +15,10 @@ # if(CMAKE_GENERATOR MATCHES "Visual Studio 7") set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -endif(CMAKE_GENERATOR MATCHES "Visual Studio 7") +endif() if(CMAKE_GENERATOR MATCHES "Visual Studio 6") set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -endif(CMAKE_GENERATOR MATCHES "Visual Studio 6") +endif() include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$") @@ -38,27 +38,27 @@ endif() if(CMAKE_SYSTEM MATCHES "AIX.*") if(NOT CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -bhalt:5 ") - endif(NOT CMAKE_COMPILER_IS_GNUCXX) -endif(CMAKE_SYSTEM MATCHES "AIX.*") + endif() +endif() if(CMAKE_SYSTEM MATCHES "IRIX.*") if(NOT CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-woff84 -no_auto_include") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-woff15") - endif(NOT CMAKE_COMPILER_IS_GNUCXX) -endif(CMAKE_SYSTEM MATCHES "IRIX.*") + endif() +endif() if(CMAKE_SYSTEM MATCHES "OSF1-V.*") if(NOT CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -timplicit_local -no_implicit_include ") - endif(NOT CMAKE_COMPILER_IS_GNUCXX) -endif(CMAKE_SYSTEM MATCHES "OSF1-V.*") + endif() +endif() # use the ansi CXX compile flag for building cmake if (CMAKE_ANSI_CXXFLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}") -endif (CMAKE_ANSI_CXXFLAGS) +endif () if (CMAKE_ANSI_CFLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}") -endif (CMAKE_ANSI_CFLAGS) +endif () |