From ff1d3efab4ac01652d23a44a0233049a27f9e61f Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 15 Jan 2019 12:09:10 +0000 Subject: [PATCH] Changes to support x64 Windows builds in preparation for Qt v5.12 --- CMake/Modules/Findhamlib.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMake/Modules/Findhamlib.cmake b/CMake/Modules/Findhamlib.cmake index 7eebf1066..98419bda1 100644 --- a/CMake/Modules/Findhamlib.cmake +++ b/CMake/Modules/Findhamlib.cmake @@ -47,7 +47,11 @@ if (NOT PC_HAMLIB_FOUND) # libusb-1.0 has no pkg-config file on Windows so we have to find it # ourselves - find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll) + 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) + endif () if (LIBUSB) set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES}) get_filename_component (hamlib_libusb_path ${LIBUSB} PATH)