w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bill's fix to the hamlib CMake file.

Browse Source
This commit is contained in:
Joe Taylor 2021-04-17 08:53:42 -04:00
parent c143c2c279
commit 4a2378c163
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/Modules/FindHamlib.cmake
View File

@ -24,7 +24,7 @@ libfind_process (Hamlib)
if (NOT Hamlib_PKGCONF_FOUND) if (NOT Hamlib_PKGCONF_FOUND)
if (WIN32) if (WIN32)
set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};ws2_32) set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};${Usb_LIBRRARY};ws2_32)
else () else ()
set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};m;dl) set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};m;dl)
endif () endif ()
@ -36,7 +36,7 @@ endif ()
# it wrong for frameworks # it wrong for frameworks
unset (_next_is_framework) unset (_next_is_framework)
unset (_Hamlib_EXTRA_LIBS) unset (_Hamlib_EXTRA_LIBS)
foreach (_lib IN LISTS Hamlib_PKGCONF_LDFLAGS) foreach (_lib IN LISTS Hamlib_LIBRARIES Hamlib_PKGCONF_LDFLAGS)
if (_next_is_framework) if (_next_is_framework)
list (APPEND _Hamlib_EXTRA_LIBS "-framework ${_lib}") list (APPEND _Hamlib_EXTRA_LIBS "-framework ${_lib}")
unset (_next_is_framework) unset (_next_is_framework)