[kde-freebsd] KDE/kdelibs/cmake/modules

[Adriaan de Groot]

SVN commit 700122 by adridg:

On FreeBSD, CUPS lives in /usr/local/lib which needs to be added to the link path; use the technique from FindX11 to get the dir of the library and pass that on to check_library_exists. Fixes CUPS detection on FreeBSD.
CCMAIL: neundorf at kde.org
CCMAIL: kde at freebsd.org


 M  +3 -2      FindCups.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindCups.cmake #700121:700122
@@ -23,15 +23,16 @@
 
 IF (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
    SET(CUPS_FOUND TRUE)
+   GET_FILENAME_COMPONENT(CUPS_LIBRARY_DIR ${CUPS_LIBRARIES} PATH)
 
    # ippDeleteAttribute is new in cups-1.1.19 (and used by kdeprint)
-   CHECK_LIBRARY_EXISTS(cups ippDeleteAttribute "" CUPS_HAS_IPP_DELETE_ATTRIBUTE)
+   CHECK_LIBRARY_EXISTS(cups ippDeleteAttribute ${CUPS_LIBRARY_DIR} CUPS_HAS_IPP_DELETE_ATTRIBUTE)
    IF (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE AND NOT CUPS_HAS_IPP_DELETE_ATTRIBUTE)
       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)
+   CHECK_LIBRARY_EXISTS(cups cupsDoAuthentication ${CUPS_LIBRARY_DIR} 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)