diff options
| author | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
| commit | c3aa7326095a1a8c744e269a04572de74600df8d (patch) | |
| tree | 983711ae9718128617b5f1880f8c6399e38e4055 /host/cmake/Modules/FindUSB1.cmake | |
| parent | aa3d9a9da0405e84e720870a13718b177d85652c (diff) | |
| parent | 8f0f045cdac16ae84bc446b230beb2b651428294 (diff) | |
| download | uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.gz uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.bz2 uhd-c3aa7326095a1a8c744e269a04572de74600df8d.zip | |
Merge branch 'master' into mwest_coverity
Conflicts:
host/lib/usrp/b200/b200_iface.cpp
Diffstat (limited to 'host/cmake/Modules/FindUSB1.cmake')
| -rw-r--r-- | host/cmake/Modules/FindUSB1.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake index a494e1350..b2e4d118c 100644 --- a/host/cmake/Modules/FindUSB1.cmake +++ b/host/cmake/Modules/FindUSB1.cmake @@ -8,7 +8,8 @@ PKG_CHECK_MODULES(PC_LIBUSB QUIET libusb-1.0) FIND_PATH(LIBUSB_INCLUDE_DIRS NAMES libusb.h - HINTS $ENV{LIBUSB_DIR}/include ${PC_LIBUSB_INCLUDEDIR} + HINTS $ENV{LIBUSB_DIR}/include $ENV{LIBUSB_DIR}/include/libusb-1.0 + ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDEDIR}/libusb-1.0 PATHS /usr/local/include/libusb-1.0 /usr/local/include /usr/include/libusb-1.0 /usr/include /opt/local/include/libusb-1.0 |