Browse Source

cmake libusb module: reverted breaking changes

chirpmodem-v8.0.0
f4exb 8 years ago
parent
commit
760e4859dd
  1. 6
      cmake/Modules/FindLibUSB.cmake

6
cmake/Modules/FindLibUSB.cmake

@ -1,7 +1,6 @@
if(NOT LIBUSB_FOUND) if(NOT LIBUSB_FOUND)
pkg_check_modules (LIBUSB_PKG libusb-1.0) pkg_check_modules (LIBUSB_PKG libusb-1.0)
find_path(LIBUSB_INCLUDE_DIR find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
NAMES libusb-1.0/libusb.h
PATHS PATHS
${LIBUSB_PKG_INCLUDE_DIRS} ${LIBUSB_PKG_INCLUDE_DIRS}
/usr/include/libusb-1.0 /usr/include/libusb-1.0
@ -9,8 +8,7 @@ if(NOT LIBUSB_FOUND)
/usr/local/include /usr/local/include
) )
find_library(LIBUSB_LIBRARIES find_library(LIBUSB_LIBRARIES NAMES usb-1.0
NAMES usb-1.0
PATHS PATHS
${LIBUSB_PKG_LIBRARY_DIRS} ${LIBUSB_PKG_LIBRARY_DIRS}
/usr/lib /usr/lib

Loading…
Cancel
Save