diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 13:50:14 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 14:19:16 -0400 |
| commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
| tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/CMakeTestCXXCompiler.cmake | |
| parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
| download | cmake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz | |
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/CMakeTestCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeTestCXXCompiler.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/CMakeTestCXXCompiler.cmake b/Modules/CMakeTestCXXCompiler.cmake index 52eaa3ccaa..5ed826b784 100644 --- a/Modules/CMakeTestCXXCompiler.cmake +++ b/Modules/CMakeTestCXXCompiler.cmake @@ -30,7 +30,7 @@ if(NOT CMAKE_CXX_COMPILER_WORKS) ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCXXCompiler.cxx OUTPUT_VARIABLE __CMAKE_CXX_COMPILER_OUTPUT) set(CXX_TEST_WAS_RUN 1) -endif(NOT CMAKE_CXX_COMPILER_WORKS) +endif() if(NOT CMAKE_CXX_COMPILER_WORKS) PrintTestCompilerStatus("CXX" " -- broken") @@ -46,19 +46,19 @@ if(NOT CMAKE_CXX_COMPILER_WORKS) "is not able to compile a simple test program.\nIt fails " "with the following output:\n ${__CMAKE_CXX_COMPILER_OUTPUT}\n\n" "CMake will not be able to correctly generate this project.") -else(NOT CMAKE_CXX_COMPILER_WORKS) +else() if(CXX_TEST_WAS_RUN) PrintTestCompilerStatus("CXX" " -- works") file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Determining if the CXX compiler works passed with " "the following output:\n${__CMAKE_CXX_COMPILER_OUTPUT}\n\n") - endif(CXX_TEST_WAS_RUN) + endif() set(CMAKE_CXX_COMPILER_WORKS 1 CACHE INTERNAL "") if(CMAKE_CXX_COMPILER_FORCED) # The compiler configuration was forced by the user. # Assume the user has configured all compiler information. - else(CMAKE_CXX_COMPILER_FORCED) + else() # Try to identify the ABI and configure it into CMakeCXXCompiler.cmake include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerABI.cmake) CMAKE_DETERMINE_COMPILER_ABI(CXX ${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp) @@ -68,13 +68,13 @@ else(NOT CMAKE_CXX_COMPILER_WORKS) @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0 ) include(${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXCompiler.cmake) - endif(CMAKE_CXX_COMPILER_FORCED) + endif() if(CMAKE_CXX_SIZEOF_DATA_PTR) foreach(f ${CMAKE_CXX_ABI_FILES}) include(${f}) endforeach() unset(CMAKE_CXX_ABI_FILES) endif() -endif(NOT CMAKE_CXX_COMPILER_WORKS) +endif() unset(__CMAKE_CXX_COMPILER_OUTPUT) |