diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-11-30 19:52:51 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-11-30 19:52:51 +0000 |
| commit | 82ae5d70756619522eab946b9efe88bb91ef9365 (patch) | |
| tree | 00549510f8f3adb3dddb11f3a05a5a8ccc843f7f | |
| parent | 7541066130fa7d4a57875b9c6d95f6e169a7f853 (diff) | |
| download | extra-cmake-modules-82ae5d70756619522eab946b9efe88bb91ef9365.tar.gz extra-cmake-modules-82ae5d70756619522eab946b9efe88bb91ef9365.tar.bz2 | |
-proper indenting
-fix typo: USB_FIND_QUIETLY
-remove now-unnecessary standard unix search paths
Alex
svn path=/trunk/KDE/kdelibs/; revision=609436
| -rw-r--r-- | modules/FindUSB.cmake | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index e4ffbac5..6499fc4f 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -17,24 +17,18 @@ if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) set(LIBUSB_FOUND TRUE) 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) -ENDIF(NOT WIN32) - FIND_PATH(LIBUSB_INCLUDE_DIR usb.h - /usr/include - /usr/local/include - ) + 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) + ENDIF(NOT WIN32) + + FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ) FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb - PATHS - ${_libUSBLinkDir} - /usr/lib - /usr/local/lib - ) + PATHS ${_libUSBLinkDir} ) set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} CACHE INTERNAL "The libraries for libusb" ) @@ -43,13 +37,13 @@ ENDIF(NOT WIN32) endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) if (LIBUSB_FOUND) - if (NOT libUSB_FIND_QUIETLY) + if (NOT USB_FIND_QUIETLY) message(STATUS "Found LIBUSB: ${LIBUSB_LIBRARIES}") - endif (NOT libUSB_FIND_QUIETLY) + endif (NOT USB_FIND_QUIETLY) else (LIBUSB_FOUND) - if (libUSB_FIND_REQUIRED) + if (USB_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find LIBUSB") - endif (libUSB_FIND_REQUIRED) + endif (USB_FIND_REQUIRED) endif (LIBUSB_FOUND) MARK_AS_ADVANCED( |