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/FindCups.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/FindCups.cmake')
| -rw-r--r-- | Modules/FindCups.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Modules/FindCups.cmake b/Modules/FindCups.cmake index 05d2c27..f74366b 100644 --- a/Modules/FindCups.cmake +++ b/Modules/FindCups.cmake @@ -32,7 +32,7 @@ if (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES AND CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) # ippDeleteAttribute is new in cups-1.1.19 (and used by kdeprint) CHECK_LIBRARY_EXISTS(cups ippDeleteAttribute "" CUPS_HAS_IPP_DELETE_ATTRIBUTE) -endif (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES AND CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) +endif () if (CUPS_INCLUDE_DIR AND EXISTS "${CUPS_INCLUDE_DIR}/cups/cups.h") file(STRINGS "${CUPS_INCLUDE_DIR}/cups/cups.h" cups_version_str @@ -46,13 +46,13 @@ if (CUPS_INCLUDE_DIR AND EXISTS "${CUPS_INCLUDE_DIR}/cups/cups.h") CUPS_VERSION_PART "${VLINE}") if(CUPS_VERSION_STRING) set(CUPS_VERSION_STRING "${CUPS_VERSION_STRING}.${CUPS_VERSION_PART}") - else(CUPS_VERSION_STRING) + else() set(CUPS_VERSION_STRING "${CUPS_VERSION_PART}") - endif(CUPS_VERSION_STRING) + endif() endif() - endforeach(VLINE) - endforeach(VPART) -endif (CUPS_INCLUDE_DIR AND EXISTS "${CUPS_INCLUDE_DIR}/cups/cups.h") + endforeach() + endforeach() +endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) @@ -60,10 +60,10 @@ if (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cups REQUIRED_VARS CUPS_LIBRARIES CUPS_INCLUDE_DIR CUPS_HAS_IPP_DELETE_ATTRIBUTE VERSION_VAR CUPS_VERSION_STRING) -else (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) +else () FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cups REQUIRED_VARS CUPS_LIBRARIES CUPS_INCLUDE_DIR VERSION_VAR CUPS_VERSION_STRING) -endif (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) +endif () mark_as_advanced(CUPS_INCLUDE_DIR CUPS_LIBRARIES) |