diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2013-02-14 13:18:10 +0400 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2013-02-15 03:04:12 +0400 |
| commit | 095dfb3fdb61056bcfc2d449450c7c4a359cbea7 (patch) | |
| tree | 3200a704a30685fe087f2f832645568a8cc2572e | |
| parent | 1923f89331d68e3669ce1d81b8697e3b1f84bff5 (diff) | |
| download | extra-cmake-modules-095dfb3fdb61056bcfc2d449450c7c4a359cbea7.tar.gz extra-cmake-modules-095dfb3fdb61056bcfc2d449450c7c4a359cbea7.tar.bz2 | |
Fix FindLibUSB1
- set properties on LibUSB1, not USB1
- use LibUSB1_ prefix, not LIBUSB1_
- except for _FOUND, see FPHSA
REVIEW:108954
| -rw-r--r-- | find-modules/FindLibUSB1.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/find-modules/FindLibUSB1.cmake b/find-modules/FindLibUSB1.cmake index 100426ec..eba47115 100644 --- a/find-modules/FindLibUSB1.cmake +++ b/find-modules/FindLibUSB1.cmake @@ -2,10 +2,10 @@ # Once done this defines # # LIBUSB1_FOUND - system has libusb-1.0 -# LIBUSB1_INCLUDE_DIRS - the libusb-1.0 include directory -# LIBUSB1_LIBRARIES - Link these to use libusb-1.0 +# LibUSB1_INCLUDE_DIRS - the libusb-1.0 include directory +# LibUSB1_LIBRARIES - Link these to use libusb-1.0 -# Copyright (c) 2011 Yury Kudryashov, <urkud@ya.ru> +# Copyright (c) 2011, 2013 Yury Kudryashov, <urkud@ya.ru> # Based on FindUSB.cmake which is: # Copyright (c) 2006, 2008 Laurent Montel, <montel@kde.org> # @@ -15,23 +15,23 @@ # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) -pkg_check_modules(PC_LIBUSB1 QUIET libusb-1.0) +pkg_check_modules(PC_LibUSB1 QUIET libusb-1.0) -find_path(LIBUSB1_TOP_INCLUDE_DIR libusb-1.0/libusb.h - HINTS ${PC_LIBUSB1_INCLUDEDIR}) +find_path(LibUSB1_TOP_INCLUDE_DIR libusb-1.0/libusb.h + HINTS ${PC_LibUSB1_INCLUDEDIR}) -set(LIBUSB1_INCLUDE_DIRS ${LIBUSB1_TOP_INCLUDE_DIR}/libusb-1.0) +set(LibUSB1_INCLUDE_DIRS ${LibUSB1_TOP_INCLUDE_DIR}/libusb-1.0) -find_library(LIBUSB1_LIBRARY NAMES usb-1.0 - HINTS ${PC_LIBUSB1_LIBDIR} ${PC_LIBUSB1_LIBRARY_DIRS}) +find_library(LibUSB1_LIBRARY NAMES usb-1.0 + HINTS ${PC_LibUSB1_LIBDIR} ${PC_LibUSB1_LIBRARY_DIRS}) -set(LIBUSB1_LIBRARIES ${LIBUSB1_LIBRARY}) +set(LibUSB1_LIBRARIES ${LibUSB1_LIBRARY}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LIBUSB1 DEFAULT_MSG LIBUSB1_LIBRARIES LIBUSB1_INCLUDE_DIRS) +find_package_handle_standard_args(LibUSB1 DEFAULT_MSG LibUSB1_LIBRARIES LibUSB1_INCLUDE_DIRS) include(FeatureSummary) -set_package_properties(USB1 PROPERTIES URL http://www.libusb.org/ +set_package_properties(LibUSB1 PROPERTIES URL http://www.libusb.org/ DESCRIPTION "A library that provides uniform API to access USB devices on many OSes") -mark_as_advanced(LIBUSB1_TOP_INCLUDE_DIR LIBUSB1_LIBRARY) +mark_as_advanced(LibUSB1_TOP_INCLUDE_DIR LibUSB1_LIBRARY) |