From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Tue, 2 Feb 2010 17:52:37 +0000 (+0100)
Subject: We need to find libusb-1, so adapt the CMake support files
X-Git-Tag: v1.0rc1~181
X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=5478cd5944da978707c0c23c5c7a84554a0ea6f7

We need to find libusb-1, so adapt the CMake support files
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3595198..564dc4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug)
    add_definitions(-DDEBUG)
 endif(${CMAKE_BUILD_TYPE} STREQUAL Debug)
 
-FIND_PACKAGE(USB REQUIRED)
+FIND_PACKAGE(USB1 REQUIRED)
 INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIR})
 
 # Set components
diff --git a/FindUSB.cmake b/FindUSB1.cmake
similarity index 89%
rename from FindUSB.cmake
rename to FindUSB1.cmake
index 566cdd8..ebcac99 100644
--- a/FindUSB.cmake
+++ b/FindUSB1.cmake
@@ -21,13 +21,13 @@ 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 libusb-1.0)
   ENDIF(NOT WIN32)
 
-  FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
+  FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
     PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
 
-  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb 
+  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
     PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
 
   include(FindPackageHandleStandardArgs)