From 558d621c385e9bc38055dbfc66b48b5e277b3cbe Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Fri, 30 Apr 2021 14:50:22 +0100 Subject: [PATCH 1/2] Fix FindLIBUSB.cmake for Windows builds Based on a modified version of the suggestions in https://www.raspberrypi.org/forums/viewtopic.php?p=1854531 --- cmake/FindLIBUSB.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/FindLIBUSB.cmake b/cmake/FindLIBUSB.cmake index c8cc62c5..f4a673c9 100644 --- a/cmake/FindLIBUSB.cmake +++ b/cmake/FindLIBUSB.cmake @@ -19,10 +19,12 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) pkg_check_modules(PC_LIBUSB libusb-1.0) ENDIF(NOT WIN32) FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h + HINTS $ENV{LIBUSB_ROOT}/include/libusb-1.0 PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) - FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 + FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb-1.0 + HINTS $ENV{LIBUSB_ROOT}/VS2019/MS32/static PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) -endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) \ No newline at end of file +endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) From 549023219afcf048400ca4208e7149fbd806a36c Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Sat, 15 May 2021 20:09:46 +0100 Subject: [PATCH 2/2] Use the NAMES option properly, also support FreeBSD --- cmake/FindLIBUSB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindLIBUSB.cmake b/cmake/FindLIBUSB.cmake index f4a673c9..eab58d67 100644 --- a/cmake/FindLIBUSB.cmake +++ b/cmake/FindLIBUSB.cmake @@ -21,7 +21,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h HINTS $ENV{LIBUSB_ROOT}/include/libusb-1.0 PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) - FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb-1.0 + FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb usb-1.0 libusb-1.0 HINTS $ENV{LIBUSB_ROOT}/VS2019/MS32/static PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs)