From eb2dd953289c2cf3151b1badda8afe6e5458024d Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 26 Sep 2010 16:38:25 +0000 Subject: -consistent upper/lowercasing -remove the unnecessary if(already found) set(QUIET TRUE), since this is already handled by find_package_handle_standard_args() Alex svn path=/trunk/KDE/kdelibs/; revision=1179961 --- modules/FindUSB.cmake | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index dfcf650c..f0178a3c 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -11,28 +11,20 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (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 + find_package(PkgConfig) + pkg_check_modules(PC_LIBUSB QUIET libusb) +endif(NOT WIN32) - # in cache already - set(LIBUSB_FOUND TRUE) +find_path(LIBUSB_INCLUDE_DIR usb.h + HINTS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) -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 - find_package(PkgConfig) - pkg_check_modules(PC_LIBUSB QUIET libusb) - ENDIF(NOT WIN32) +find_library(LIBUSB_LIBRARIES NAMES usb + HINTS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) - FIND_PATH(LIBUSB_INCLUDE_DIR usb.h - PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) - FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb - PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) - - MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) - -endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) +mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) -- cgit v1.2.1