w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt to get cross platform package finding working

Browse Source
This commit is contained in:
Bill Somerville 2021-04-17 03:08:06 +01:00
parent 3591f13ff0
commit 8065f3b889
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/Modules/FindHamlib.cmake
View File

@ -93,8 +93,6 @@ libfind_process (Hamlib)
if (NOT Hamlib_PKGCONF_FOUND) if (NOT Hamlib_PKGCONF_FOUND)
if (WIN32) if (WIN32)
set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};${Usb_LIBRARY};ws2_32) set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};${Usb_LIBRARY};ws2_32)
# pretend pkg-config worked
set (Hamlib_PKGCONF_LDFLAGS ${Usb_LIBRARY};ws2_32)
else () else ()
set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};m;dl) set (Hamlib_LIBRARIES ${Hamlib_LIBRARIES};m;dl)
endif () endif ()
@ -106,7 +104,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)
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)