diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-07-20 10:46:39 -0700 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-21 10:05:21 +0000 |
| commit | 539ad8a91beb4eca6ddbd9a30bb3490f6666d81b (patch) | |
| tree | 151448442336e9caf462fc092ac6a3828ab7bf5f | |
| parent | e8a8fab18cc987a43d1bf2f01f51e5070598a940 (diff) | |
CMake: Remove unneeded GLIB2_LIBRARIES.
GLib is part of wsutil's link interface, so we don't need to link to it
explictly.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/wmem/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extcap/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 1 |
4 files changed, 2 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7b81f9add..22e4444fed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2824,7 +2824,6 @@ if(BUILD_dumpcap AND PCAP_FOUND) version_info pcap::pcap ${CAP_LIBRARIES} - ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${ZLIB_LIBRARIES} ${APPLE_CORE_FOUNDATION_LIBRARY} @@ -2876,7 +2875,6 @@ endif() # We probably shouldn't do that. if(BUILD_dcerpcidl2wrs) set(idl2wrs_LIBS - ${GLIB2_LIBRARIES} wsutil ) set(idl2wrs_FILES diff --git a/epan/wmem/CMakeLists.txt b/epan/wmem/CMakeLists.txt index 094927cc98..fc58e5f781 100644 --- a/epan/wmem/CMakeLists.txt +++ b/epan/wmem/CMakeLists.txt @@ -83,7 +83,7 @@ set_target_properties(wmem PROPERTIES 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 FOLDER "Tests" diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index 8210572100..95263c491b 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -93,7 +93,6 @@ if(BUILD_androiddump) ui wiretap wsutil - ${GLIB2_LIBRARIES} ${WIN_WS2_32_LIBRARY} $<$<BOOL:${PCAP_FOUND}>:pcap::pcap> ) @@ -105,7 +104,6 @@ if(BUILD_androiddump) ui wiretap wsutil - ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} @@ -128,7 +126,6 @@ endif() if(BUILD_sshdump AND LIBSSH_FOUND) set(sshdump_LIBS wsutil - ${GLIB2_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} ${LIBSSH_LIBRARIES} @@ -155,7 +152,6 @@ if(BUILD_ciscodump AND LIBSSH_FOUND) set(ciscodump_LIBS writecap wsutil - ${GLIB2_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} ${LIBSSH_LIBRARIES} @@ -180,10 +176,9 @@ endif() if(BUILD_dpauxmon AND HAVE_LIBNL3) set(dpauxmon_LIBS - ${GLIB2_LIBRARIES} - ${CMAKE_DL_LIBS} wsutil writecap + ${CMAKE_DL_LIBS} ${NL_LIBRARIES} ) set(dpauxmon_FILES @@ -205,7 +200,6 @@ endif() if(BUILD_udpdump) set(udpdump_LIBS wsutil - ${GLIB2_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} wsutil @@ -230,7 +224,6 @@ if(BUILD_randpktdump) randpkt_core wiretap wsutil - ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} @@ -257,7 +250,6 @@ if(BUILD_etwdump AND WIN32) tdh wevtapi rpcrt4 - ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} @@ -283,7 +275,6 @@ if(BUILD_sdjournal AND SYSTEMD_FOUND) wiretap writecap wsutil - ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${SYSTEMD_LIBRARIES} diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index ded80e4558..f5054e773a 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -181,7 +181,6 @@ endif() target_link_libraries(wiretap PUBLIC wsutil - ${GLIB2_LIBRARIES} PRIVATE ${ZLIB_LIBRARIES} ) |