Merge branch 'master' into jtdx_32a

Author: Arvo Järve

CMake/Modules/Findhamlib.cmake

@@ -53,7 +53,11 @@ if (NOT PC_HAMLIB_FOUND)
   if (CMAKE_SIZEOF_VOID_P MATCHES "8")
     find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW64/dll)
   else ()
-    find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll)
+    if (hamlib_STATIC)
+      find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/static)
+    else ()
+      find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll)
+    endif ()
   endif ()
   if (LIBUSB)
     set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
@@ -70,7 +74,9 @@ else ()
       set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
       set (hamlib_PROCESS_LIBS PC_HAMLIB_STATIC_LDFLAGS hamlib_EXTRA_LIBRARIES)
     else ()
-      set (hamlib_PROCESS_LIBS PC_HAMLIB_STATIC_LDFLAGS)
+      find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/static)
+      set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES})
+      set (hamlib_PROCESS_LIBS PC_HAMLIB_STATIC_LDFLAGS hamlib_EXTRA_LIBRARIES)
     endif ()
     set (hamlib_LIBRARY_DIRS ${PC_HAMLIB_STATIC_LIBRARY_DIRS})
   else ()