From 80a85a69f224038b294ed91cbb31064694e2832e Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Fri, 14 Dec 2007 18:38:27 +0000 Subject: few fixes i had lying here: - fix the usb detrction once again - take into account the include dirs got from pkg-config when looking for usb.h - show the library (not the include path) when showing the "libsub found" message svn path=/trunk/KDE/kdelibs/; revision=748534 --- modules/FindUSB.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 7b895cb3..17d893c9 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -25,13 +25,14 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) ENDIF(NOT WIN32) - FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ) + FIND_PATH(LIBUSB_INCLUDE_DIR usb.h + PATHS ${_libUSBIncDir} ) FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb PATHS ${_libUSBLinkDir} ) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) -- cgit v1.2.1