From 8065f3b889187de95b1cb3545b97335ad2177acb Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 17 Apr 2021 03:08:06 +0100 Subject: [PATCH] Another attempt to get cross platform package finding working --- CMake/Modules/FindHamlib.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMake/Modules/FindHamlib.cmake b/CMake/Modules/FindHamlib.cmake index aa17b2aa1..a0a475a66 100644 --- a/CMake/Modules/FindHamlib.cmake +++ b/CMake/Modules/FindHamlib.cmake @@ -93,8 +93,6 @@ libfind_process (Hamlib) if (NOT Hamlib_PKGCONF_FOUND) if (WIN32) set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};${Usb_LIBRARY};ws2_32) - # pretend pkg-config worked - set (Hamlib_PKGCONF_LDFLAGS ${Usb_LIBRARY};ws2_32) else () set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};m;dl) endif () @@ -106,7 +104,7 @@ endif () # it wrong for frameworks unset (_next_is_framework) unset (_Hamlib_EXTRA_LIBS) -foreach (_lib IN LISTS Hamlib_PKGCONF_LDFLAGS) +foreach (_lib IN LISTS Hamlib_LIBRARIES) if (_next_is_framework) list (APPEND _Hamlib_EXTRA_LIBS "-framework ${_lib}") unset (_next_is_framework)