← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to cmake/modules/FindUSB.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/modules/FindUSB.cmake
21
21
    # use pkg-config to get the directories and then use these values
22
22
    # in the FIND_PATH() and FIND_LIBRARY() calls
23
23
    find_package(PkgConfig)
24
 
    pkg_check_modules(LIBUSB libusb)
 
24
    pkg_check_modules(PC_LIBUSB libusb)
25
25
  ENDIF(NOT WIN32)
26
26
 
27
27
  FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
28
 
    PATHS ${LIBUSB_INCLUDE_DIRS} )
 
28
    PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
29
29
 
30
30
  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb 
31
 
    PATHS ${LIBUSB_LIBRARY_DIRS} )
 
31
    PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
32
32
 
33
33
  include(FindPackageHandleStandardArgs)
34
34
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)