CMake: Remove unneeded GLIB2_LIBRARIES.
GLib is part of wsutil's link interface, so we don't need to link to it explictly.
This commit is contained in:
parent
e8a8fab18c
commit
539ad8a91b
|
@ -2824,7 +2824,6 @@ if(BUILD_dumpcap AND PCAP_FOUND)
|
||||||
version_info
|
version_info
|
||||||
pcap::pcap
|
pcap::pcap
|
||||||
${CAP_LIBRARIES}
|
${CAP_LIBRARIES}
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${GTHREAD2_LIBRARIES}
|
${GTHREAD2_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
${APPLE_CORE_FOUNDATION_LIBRARY}
|
${APPLE_CORE_FOUNDATION_LIBRARY}
|
||||||
|
@ -2876,7 +2875,6 @@ endif()
|
||||||
# We probably shouldn't do that.
|
# We probably shouldn't do that.
|
||||||
if(BUILD_dcerpcidl2wrs)
|
if(BUILD_dcerpcidl2wrs)
|
||||||
set(idl2wrs_LIBS
|
set(idl2wrs_LIBS
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
wsutil
|
wsutil
|
||||||
)
|
)
|
||||||
set(idl2wrs_FILES
|
set(idl2wrs_FILES
|
||||||
|
|
|
@ -83,7 +83,7 @@ set_target_properties(wmem PROPERTIES
|
||||||
|
|
||||||
add_executable(wmem_test EXCLUDE_FROM_ALL wmem_test.c $<TARGET_OBJECTS:wmem>)
|
add_executable(wmem_test EXCLUDE_FROM_ALL wmem_test.c $<TARGET_OBJECTS:wmem>)
|
||||||
|
|
||||||
target_link_libraries(wmem_test ${GLIB2_LIBRARIES} wsutil)
|
target_link_libraries(wmem_test wsutil)
|
||||||
|
|
||||||
set_target_properties(wmem_test PROPERTIES
|
set_target_properties(wmem_test PROPERTIES
|
||||||
FOLDER "Tests"
|
FOLDER "Tests"
|
||||||
|
|
|
@ -93,7 +93,6 @@ if(BUILD_androiddump)
|
||||||
ui
|
ui
|
||||||
wiretap
|
wiretap
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
|
$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
|
||||||
)
|
)
|
||||||
|
@ -105,7 +104,6 @@ if(BUILD_androiddump)
|
||||||
ui
|
ui
|
||||||
wiretap
|
wiretap
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
|
@ -128,7 +126,6 @@ endif()
|
||||||
if(BUILD_sshdump AND LIBSSH_FOUND)
|
if(BUILD_sshdump AND LIBSSH_FOUND)
|
||||||
set(sshdump_LIBS
|
set(sshdump_LIBS
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
${LIBSSH_LIBRARIES}
|
${LIBSSH_LIBRARIES}
|
||||||
|
@ -155,7 +152,6 @@ if(BUILD_ciscodump AND LIBSSH_FOUND)
|
||||||
set(ciscodump_LIBS
|
set(ciscodump_LIBS
|
||||||
writecap
|
writecap
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
${LIBSSH_LIBRARIES}
|
${LIBSSH_LIBRARIES}
|
||||||
|
@ -180,10 +176,9 @@ endif()
|
||||||
|
|
||||||
if(BUILD_dpauxmon AND HAVE_LIBNL3)
|
if(BUILD_dpauxmon AND HAVE_LIBNL3)
|
||||||
set(dpauxmon_LIBS
|
set(dpauxmon_LIBS
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${CMAKE_DL_LIBS}
|
|
||||||
wsutil
|
wsutil
|
||||||
writecap
|
writecap
|
||||||
|
${CMAKE_DL_LIBS}
|
||||||
${NL_LIBRARIES}
|
${NL_LIBRARIES}
|
||||||
)
|
)
|
||||||
set(dpauxmon_FILES
|
set(dpauxmon_FILES
|
||||||
|
@ -205,7 +200,6 @@ endif()
|
||||||
if(BUILD_udpdump)
|
if(BUILD_udpdump)
|
||||||
set(udpdump_LIBS
|
set(udpdump_LIBS
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
wsutil
|
wsutil
|
||||||
|
@ -230,7 +224,6 @@ if(BUILD_randpktdump)
|
||||||
randpkt_core
|
randpkt_core
|
||||||
wiretap
|
wiretap
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
|
@ -257,7 +250,6 @@ if(BUILD_etwdump AND WIN32)
|
||||||
tdh
|
tdh
|
||||||
wevtapi
|
wevtapi
|
||||||
rpcrt4
|
rpcrt4
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${WIN_WS2_32_LIBRARY}
|
${WIN_WS2_32_LIBRARY}
|
||||||
|
@ -283,7 +275,6 @@ if(BUILD_sdjournal AND SYSTEMD_FOUND)
|
||||||
wiretap
|
wiretap
|
||||||
writecap
|
writecap
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
${SYSTEMD_LIBRARIES}
|
${SYSTEMD_LIBRARIES}
|
||||||
|
|
|
@ -181,7 +181,6 @@ endif()
|
||||||
target_link_libraries(wiretap
|
target_link_libraries(wiretap
|
||||||
PUBLIC
|
PUBLIC
|
||||||
wsutil
|
wsutil
|
||||||
${GLIB2_LIBRARIES}
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue