Skip to content

Commit 757f2ae

Browse files
committed
incorporate slightly modified Win32 usb find helpers
1 parent ce76970 commit 757f2ae

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cmake/FindLIBUSB.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
1919
pkg_check_modules(PC_LIBUSB libusb-1.0)
2020
ENDIF(NOT WIN32)
2121
FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
22+
HINTS $ENV{LIBUSB_ROOT}/include/libusb-1.0
2223
PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
23-
FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
24+
FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb-1.0 usb-1.0 usb
25+
HINTS $ENV{LIBUSB_ROOT}/VS2019/MS32/static
2426
PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
2527
include(FindPackageHandleStandardArgs)
2628
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)
2729
MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
28-
endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
30+
endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)

0 commit comments

Comments
 (0)