diff options
| author | Alex Merry <kde@randomguy3.me.uk> | 2007-07-22 23:02:52 +0000 |
|---|---|---|
| committer | Alex Merry <kde@randomguy3.me.uk> | 2007-07-22 23:02:52 +0000 |
| commit | 4c8e458321e0ae7a983f537f7737b5ca3f6978e2 (patch) | |
| tree | b95d45256cfa452eeba97df55a6704687d7de9c8 | |
| parent | df1b2f4f7d9ecc7f887115f9046155970b80d55e (diff) | |
| download | extra-cmake-modules-4c8e458321e0ae7a983f537f7737b5ca3f6978e2.tar.gz extra-cmake-modules-4c8e458321e0ae7a983f537f7737b5ca3f6978e2.tar.bz2 | |
Bump minimum supported CUPS version to 1.1.20, and drop some
compatibility code.
svn path=/trunk/KDE/kdelibs/; revision=691112
| -rw-r--r-- | modules/FindCups.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake index 0fd0ae5b..92c958d9 100644 --- a/modules/FindCups.cmake +++ b/modules/FindCups.cmake @@ -6,6 +6,8 @@ # CUPS_LIBRARIES - Libraries needed to use Cups # Set CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE to TRUE if you need a version which # features this function (i.e. at least 1.1.19) +# Set CUPS_REQUIRE_CUPS_DO_AUTHENTICATION to TRUE if you need a version which +# features this function (i.e. at least 1.1.20) # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> # @@ -28,6 +30,12 @@ IF (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) SET(CUPS_FOUND FALSE) ENDIF (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE AND NOT CUPS_HAS_IPP_DELETE_ATTRIBUTE) + # cupsDoAuthentication is new in cups-1.1.20 (and used by kdeprint) + CHECK_LIBRARY_EXISTS(cups cupsDoAuthentication "" CUPS_HAS_CUPS_DO_AUTHENTICATION) + IF (CUPS_REQUIRE_CUPS_DO_AUTHENTICATION AND NOT CUPS_HAS_CUPS_DO_AUTHENTICATION) + SET(CUPS_FOUND FALSE) + ENDIF (CUPS_REQUIRE_CUPS_DO_AUTHENTICATION AND NOT CUPS_HAS_CUPS_DO_AUTHENTICATION) + ELSE (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) SET(CUPS_FOUND FALSE) ENDIF (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) |