From 13b769c326f2087c87cdb78ab2fae47ec17e4b18 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 30 May 2006 09:02:38 +0000 Subject: Move cmake duplicate check here: -> FindTagLib: need by kdemultimedia/amarok -> FindPostgreSQL: need by koffice-kexi/amarok -> FindMySQL: need by koffice-kexi/amarok -> FindMusicBrainz: need by amarok/kdemultimedia -> FindUSB: need by kdebase/amarok -> FindBerkeleyDB: need by kbabel/kdevelop -> FindRUBY: need by koffice-kross/amarok I will remove them from kde module after new snapshot (next monday) svn path=/trunk/KDE/kdelibs/; revision=546487 --- modules/FindUSB.cmake | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 modules/FindUSB.cmake (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake new file mode 100644 index 00000000..b6c6949e --- /dev/null +++ b/modules/FindUSB.cmake @@ -0,0 +1,53 @@ +# - Try to find the freetype library +# Once done this defines +# +# LIBUSB_FOUND - system has libusb +# LIBUSB_INCLUDE_DIR - the libusb include directory +# LIBUSB_LIBRARIES - Link these to use libusb + +if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + + # in cache already + set(LIBUSB_FOUND TRUE) + +else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + + # 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_PATH(LIBUSB_INCLUDE_DIR usb.h + /usr/include + /usr/local/include + ) + + FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb + PATHS + ${_libUSBLinkDir} + /usr/lib + /usr/local/lib + ) + + set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} CACHE INTERNAL "The libraries for libusb" ) + + if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + set( LIBUSB_FOUND TRUE) + endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + + if (LIBUSB_FOUND) + if (NOT libUSB_FIND_QUIETLY) + message(STATUS "Found LIBUSB: ${LIBUSB_LIBRARIES}") + endif (NOT libUSB_FIND_QUIETLY) + else (LIBUSB_FOUND) + if (libUSB_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find LIBUSB") + endif (libUSB_FIND_REQUIRED) + endif (LIBUSB_FOUND) + + MARK_AS_ADVANCED( + LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES + ) + +endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindUSB.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index b6c6949e..5c4d65d6 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -4,6 +4,12 @@ # LIBUSB_FOUND - system has libusb # LIBUSB_INCLUDE_DIR - the libusb include directory # LIBUSB_LIBRARIES - Link these to use libusb +# +# Copyright (c) 2006, Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -- cgit v1.2.1 From 491b73d5a0712517b0be22ef7657b91a078ec08c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 20 Nov 2006 09:34:10 +0000 Subject: Don't try to use pkg-config under Windows svn path=/trunk/KDE/kdelibs/; revision=606389 --- modules/FindUSB.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 5c4d65d6..e4ffbac5 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -17,13 +17,13 @@ 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 -- cgit v1.2.1 From 82ae5d70756619522eab946b9efe88bb91ef9365 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 30 Nov 2006 19:52:51 +0000 Subject: -proper indenting -fix typo: USB_FIND_QUIETLY -remove now-unnecessary standard unix search paths Alex svn path=/trunk/KDE/kdelibs/; revision=609436 --- modules/FindUSB.cmake | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'modules/FindUSB.cmake') 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( -- cgit v1.2.1 From b6c97d5c0d66816053b615873b76eddb47cc3cca Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 7 Aug 2007 11:33:58 +0000 Subject: fix typo found by pino svn path=/trunk/KDE/kdelibs/; revision=697289 --- modules/FindUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 6499fc4f..91263fd5 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -22,7 +22,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) - PKGCONFIG(libUSB _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) + PKGCONFIG(libusb _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags) ENDIF(NOT WIN32) FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ) -- cgit v1.2.1 From 0e6e562f6144cb145c893aaf81c200e9bc4d8b73 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 26 Aug 2007 13:49:18 +0000 Subject: Use FIND_PACKAGE_HANDLE_STANDARD_ARGS svn path=/trunk/KDE/kdelibs/; revision=704860 --- modules/FindUSB.cmake | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 91263fd5..6909b05a 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -32,19 +32,8 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} CACHE INTERNAL "The libraries for libusb" ) - if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - set( LIBUSB_FOUND TRUE) - endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - - if (LIBUSB_FOUND) - if (NOT USB_FIND_QUIETLY) - message(STATUS "Found LIBUSB: ${LIBUSB_LIBRARIES}") - endif (NOT USB_FIND_QUIETLY) - else (LIBUSB_FOUND) - if (USB_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find LIBUSB") - endif (USB_FIND_REQUIRED) - endif (LIBUSB_FOUND) + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) MARK_AS_ADVANCED( LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES -- cgit v1.2.1 From 1a4976361fa26c1fff44e1765dd81469e7a14797 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 5 Dec 2007 16:15:32 +0000 Subject: don't set libs from the cache svn path=/trunk/KDE/kdelibs/; revision=745168 --- modules/FindUSB.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 6909b05a..582e5485 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -30,13 +30,9 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb PATHS ${_libUSBLinkDir} ) - set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} CACHE INTERNAL "The libraries for libusb" ) - include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(USB DEFAULT_MSG LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) - MARK_AS_ADVANCED( - LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES - ) + MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -- cgit v1.2.1 From 7164a5976d937aa0115c65820d77f2d2c539b59c Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Thu, 13 Dec 2007 13:43:41 +0000 Subject: fix libusb detection svn path=/trunk/KDE/kdelibs/; revision=748049 --- modules/FindUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 582e5485..7b895cb3 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -27,7 +27,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ) - FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb + FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb PATHS ${_libUSBLinkDir} ) include(FindPackageHandleStandardArgs) -- cgit v1.2.1 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 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 17d893c9..ff18d3b3 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -4,7 +4,7 @@ # LIBUSB_FOUND - system has libusb # LIBUSB_INCLUDE_DIR - the libusb include directory # LIBUSB_LIBRARIES - Link these to use libusb -# + # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From d69178fdea07d3f16dd8aa368f28aa20a83d3015 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 11 Nov 2008 12:38:50 +0000 Subject: Port them too svn path=/trunk/KDE/kdelibs/; revision=882802 --- modules/FindUSB.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'modules/FindUSB.cmake') 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, +# Copyright (c) 2006, 2008 Laurent Montel, # # 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) -- cgit v1.2.1 From c379d4c4e0655fac2dadd4be57e2e5cd23d40572 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 2 Dec 2008 21:49:01 +0000 Subject: -rework all uses of find_package(PkgConfig)/pkg_check_modules(): the prefix used for pkgconfig config (e.g. SQLITE) now *always* gets an additional "PC_" prefix, so the prefix used for pkgconfig is now "PC_SQLITE_". This avoids name clashes between variables defined by the pkgconfig macro and the find module and unwanted effects. *Never* use the _CFLAGS coming from pkgconfig, but always CFLAGS_OTHER, since these shouldn't contain the include directories. If the include directories would be in the DEFINITIONS variable this could clash with the results of find_path() for finding include dirs. *Always* use both foo_INCLUDEDIR, foo_INCLUDE_DIRS for searching the include dir, and also both foo_LIBDIR and foo_LIBRARY_DIRS for searching the libraries. These directories coming from pkgconfig are *never* used exclusively, but *always* additionally to the standard search dirs, either before them (then using the "HINTS" keyword) or after them (then using the "PATHS" keyword) I hope I didn't break (too much) stuff. At least on my system it all seems to work the same way as it did before, with and without pkgconfig. Alex svn path=/trunk/KDE/kdelibs/; revision=891805 --- modules/FindUSB.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 862388b9..566cdd8e 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -21,14 +21,14 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) # 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(LIBUSB libusb) + pkg_check_modules(PC_LIBUSB libusb) ENDIF(NOT WIN32) FIND_PATH(LIBUSB_INCLUDE_DIR usb.h - PATHS ${LIBUSB_INCLUDE_DIRS} ) + PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb - PATHS ${LIBUSB_LIBRARY_DIRS} ) + PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) -- cgit v1.2.1 From ac954219018fac1c1cae99b6e69be9438e452233 Mon Sep 17 00:00:00 2001 From: David Jarvie Date: Wed, 11 Mar 2009 22:39:22 +0000 Subject: Suppress 'not found' messages from pkgconfig when the module subsequently attempts to locate the package by other means. svn path=/trunk/KDE/kdelibs/; revision=938476 --- modules/FindUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindUSB.cmake') diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 566cdd8e..dfcf650c 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -21,7 +21,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) # 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 libusb) + pkg_check_modules(PC_LIBUSB QUIET libusb) ENDIF(NOT WIN32) FIND_PATH(LIBUSB_INCLUDE_DIR usb.h -- cgit v1.2.1 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