osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Fix libnl unused link dependencies

This commit is contained in:
João Valverde 2023-01-31 20:44:36 +00:00
parent d70e174ca0
commit ab0d190450
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -2588,6 +2588,7 @@ if(BUILD_wireshark AND QT_FOUND)
ui ui
capchild capchild
caputils caputils
iface_monitor
wiretap wiretap
epan epan
version_info version_info
@ -2694,6 +2695,7 @@ if(BUILD_logray AND QT_FOUND)
ui ui
capchild capchild
caputils caputils
iface_monitor
wiretap wiretap
epan epan
version_info version_info
@ -3131,6 +3133,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
writecap writecap
wsutil wsutil
caputils caputils
iface_monitor
ui ui
version_info version_info
pcap::pcap pcap::pcap

23
capture/CMakeLists.txt
View File

@ -24,8 +24,6 @@ endif()
set(CAPUTILS_SRC set(CAPUTILS_SRC
${PLATFORM_CAPUTILS_SRC} ${PLATFORM_CAPUTILS_SRC}
capture-pcap-util.c capture-pcap-util.c
iface_monitor.c
ws80211_utils.c
) )
if (AIRPCAP_FOUND) if (AIRPCAP_FOUND)
@ -51,18 +49,12 @@ target_link_libraries(caputils
$<$<BOOL:${PCAP_FOUND}>:pcap::pcap> $<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
PRIVATE PRIVATE
wsutil wsutil
${NL_LIBRARIES}
${WIN_IPHLPAPI_LIBRARY} ${WIN_IPHLPAPI_LIBRARY}
) )
if(WIN32) if(WIN32)
target_link_libraries(caputils PRIVATE ${GMODULE2_LIBRARIES}) target_link_libraries(caputils PRIVATE ${GMODULE2_LIBRARIES})
endif() endif()
target_include_directories(caputils SYSTEM
PRIVATE
${NL_INCLUDE_DIRS}
)
set_target_properties(caputils PROPERTIES set_target_properties(caputils PROPERTIES
LINK_FLAGS "${WS_LINK_FLAGS}" LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "Libs") FOLDER "Libs")
@ -100,6 +92,21 @@ if(MSVC)
set_target_properties(capchild PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}") set_target_properties(capchild PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
endif() endif()
add_library(iface_monitor STATIC
iface_monitor.c
ws80211_utils.c
)
target_link_libraries(iface_monitor
PRIVATE
${NL_LIBRARIES}
)
target_include_directories(iface_monitor SYSTEM
PRIVATE
${NL_INCLUDE_DIRS}
)
CHECKAPI( CHECKAPI(
NAME NAME
caputils-base caputils-base