Skip to content

Commit 4dd3959

Browse files
author
Arvo Järve
committed
add libusb to win32 builds
1 parent 41063b9 commit 4dd3959

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

CMake/Modules/Findhamlib.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ if (NOT PC_HAMLIB_FOUND)
5353
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
5454
find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW64/dll)
5555
else ()
56-
find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll)
56+
if (hamlib_STATIC)
57+
find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/static)
58+
else ()
59+
find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll)
60+
endif ()
5761
endif ()
5862
if (LIBUSB)
5963
set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
@@ -70,7 +74,9 @@ else ()
7074
set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
7175
set (hamlib_PROCESS_LIBS PC_HAMLIB_STATIC_LDFLAGS hamlib_EXTRA_LIBRARIES)
7276
else ()
73-
set (hamlib_PROCESS_LIBS PC_HAMLIB_STATIC_LDFLAGS)
77+
find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/static)
78+
set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
79+
set (hamlib_PROCESS_LIBS PC_HAMLIB_STATIC_LDFLAGS hamlib_EXTRA_LIBRARIES)
7480
endif ()
7581
set (hamlib_LIBRARY_DIRS ${PC_HAMLIB_STATIC_LIBRARY_DIRS})
7682
else ()

0 commit comments

Comments
 (0)