diff options
| author | Laurent Montel <montel@kde.org> | 2008-11-11 12:38:50 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2008-11-11 12:38:50 +0000 |
| commit | d69178fdea07d3f16dd8aa368f28aa20a83d3015 (patch) | |
| tree | bacfa71a3086d06ce54426582c22a781d2d9ea82 /modules/FindUSB.cmake | |
| parent | 7ab5b5f8cb7a33937cc17f73d25713e29048bf8b (diff) | |
| download | extra-cmake-modules-d69178fdea07d3f16dd8aa368f28aa20a83d3015.tar.gz extra-cmake-modules-d69178fdea07d3f16dd8aa368f28aa20a83d3015.tar.bz2 | |
Port them too
svn path=/trunk/KDE/kdelibs/; revision=882802
Diffstat (limited to 'modules/FindUSB.cmake')
| -rw-r--r-- | modules/FindUSB.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index ff18d3b3..862388b9 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -5,7 +5,7 @@ # LIBUSB_INCLUDE_DIR - the libusb include directory # LIBUSB_LIBRARIES - Link these to use libusb -# Copyright (c) 2006, Laurent Montel, <montel@kde.org> +# Copyright (c) 2006, 2008 Laurent Montel, <montel@kde.org> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -20,16 +20,15 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) + find_package(PkgConfig) + pkg_check_modules(LIBUSB libusb) ENDIF(NOT WIN32) FIND_PATH(LIBUSB_INCLUDE_DIR usb.h - PATHS ${_libUSBIncDir} ) + PATHS ${LIBUSB_INCLUDE_DIRS} ) FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb - PATHS ${_libUSBLinkDir} ) + PATHS ${LIBUSB_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) |