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 /Tests/PrecompiledHeader | |
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 'Tests/PrecompiledHeader')
-rw-r--r-- | Tests/PrecompiledHeader/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tests/PrecompiledHeader/CMakeLists.txt b/Tests/PrecompiledHeader/CMakeLists.txt index e5ac6d3..6958131 100644 --- a/Tests/PrecompiledHeader/CMakeLists.txt +++ b/Tests/PrecompiledHeader/CMakeLists.txt @@ -12,28 +12,28 @@ if(CMAKE_CONFIGURATION_TYPES) foreach(cfg ${CMAKE_CONFIGURATION_TYPES}) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/PCH/${cfg}) endforeach() -else(CMAKE_CONFIGURATION_TYPES) +else() set(PCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/PCH") file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/PCH) -endif(CMAKE_CONFIGURATION_TYPES) +endif() # The VS6 IDE does not support renaming .pch files with /Fp. if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") set(PCH_USE_INCLUDE_DIR 1) set(PCH_FILE) -else("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") +else() set(PCH_USE_INCLUDE_DIR 0) set(PCH_FILE "\"/Fp${PCH_DIR}/foo_precompiled.pch\"") -endif("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") +endif() # Choose between an explicit include path and using /I during # precompilation. The /I form is used to test that the PCH is # actually used. In practice the include path form would be used. if(PCH_USE_INCLUDE_DIR) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -else(PCH_USE_INCLUDE_DIR) +else() set(PCH_INCLUDE_DIR "\"/I${CMAKE_CURRENT_SOURCE_DIR}/include\"") -endif(PCH_USE_INCLUDE_DIR) +endif() # Create a target that will use a precompiled header. set(foo_SRCS foo1.c foo2.c) @@ -56,4 +56,4 @@ if("${CMAKE_GENERATOR}" MATCHES "Makefile" OR # These source files use the precompiled header. set_source_files_properties(${foo_SRCS} PROPERTIES OBJECT_DEPENDS "${PCH_DIR}/foo_precompiled.pch") -endif("${CMAKE_GENERATOR}" MATCHES "Makefile") +endif() |