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/CMakeDependentOption.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/CMakeDependentOption.cmake')
-rw-r--r-- | Modules/CMakeDependentOption.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Modules/CMakeDependentOption.cmake b/Modules/CMakeDependentOption.cmake index 98cae45..990728f 100644 --- a/Modules/CMakeDependentOption.cmake +++ b/Modules/CMakeDependentOption.cmake @@ -31,21 +31,21 @@ macro(CMAKE_DEPENDENT_OPTION option doc default depends force) foreach(d ${depends}) string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}") if(${CMAKE_DEPENDENT_OPTION_DEP}) - else(${CMAKE_DEPENDENT_OPTION_DEP}) + else() set(${option}_AVAILABLE 0) - endif(${CMAKE_DEPENDENT_OPTION_DEP}) - endforeach(d) + endif() + endforeach() if(${option}_AVAILABLE) option(${option} "${doc}" "${default}") set(${option} "${${option}}" CACHE BOOL "${doc}" FORCE) - else(${option}_AVAILABLE) + else() if(${option} MATCHES "^${option}$") - else(${option} MATCHES "^${option}$") + else() set(${option} "${${option}}" CACHE INTERNAL "${doc}") - endif(${option} MATCHES "^${option}$") + endif() set(${option} ${force}) - endif(${option}_AVAILABLE) - else(${option}_ISSET MATCHES "^${option}_ISSET$") + endif() + else() set(${option} "${${option}_ISSET}") - endif(${option}_ISSET MATCHES "^${option}_ISSET$") -endmacro(CMAKE_DEPENDENT_OPTION) + endif() +endmacro() |