VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix libusb-1.0 discovery

This commit is contained in:
Davide Gerhard 2019-04-15 11:11:15 +02:00
parent 21add46422
commit 013eaa79ea
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/FindLibUSB.cmake
View File

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

3
fcdhid/CMakeLists.txt
View File

@ -16,6 +16,7 @@ set(fcdhid_HEADERS
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${LIBUSB_INCLUDE_DIR}
)
#add_definitions(-DQT_PLUGIN)
@ -27,7 +28,7 @@ add_library(fcdhid SHARED
target_link_libraries(fcdhid
${LIBUSB_LIBRARIES}
${ICONV_LIBRARY}
${ICONV_LIBRARY}
)
install(TARGETS fcdhid DESTINATION lib)