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/CMakeForceCompiler.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/CMakeForceCompiler.cmake')
| -rw-r--r-- | Modules/CMakeForceCompiler.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/CMakeForceCompiler.cmake b/Modules/CMakeForceCompiler.cmake index c56406b..980cc17 100644 --- a/Modules/CMakeForceCompiler.cmake +++ b/Modules/CMakeForceCompiler.cmake @@ -52,8 +52,8 @@ macro(CMAKE_FORCE_C_COMPILER compiler id) # Set old compiler id variables. if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") set(CMAKE_COMPILER_IS_GNUCC 1) - endif("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") -endmacro(CMAKE_FORCE_C_COMPILER) + endif() +endmacro() macro(CMAKE_FORCE_CXX_COMPILER compiler id) set(CMAKE_CXX_COMPILER "${compiler}") @@ -65,8 +65,8 @@ macro(CMAKE_FORCE_CXX_COMPILER compiler id) # Set old compiler id variables. if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") set(CMAKE_COMPILER_IS_GNUCXX 1) - endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") -endmacro(CMAKE_FORCE_CXX_COMPILER) + endif() +endmacro() macro(CMAKE_FORCE_Fortran_COMPILER compiler id) set(CMAKE_Fortran_COMPILER "${compiler}") @@ -78,5 +78,5 @@ macro(CMAKE_FORCE_Fortran_COMPILER compiler id) # Set old compiler id variables. if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") set(CMAKE_COMPILER_IS_GNUG77 1) - endif("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") -endmacro(CMAKE_FORCE_Fortran_COMPILER) + endif() +endmacro() |