diff options
| -rw-r--r-- | CMakeLists.txt | 40 | ||||
| -rw-r--r-- | caputils/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | fuzz/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 30 |
6 files changed, 49 insertions, 46 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e06a4e11dd..01c3b393c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1677,22 +1677,8 @@ else() set(INSTALL_FILES COPYING ${INSTALL_FILES}) endif() -set(LIBEPAN_LIBS - epan - ${AIRPCAP_LIBRARIES} - ${PCAP_LIBRARIES} - ${CARES_LIBRARIES} - ${KERBEROS_LIBRARIES} - ${LUA_LIBRARIES} - ${GEOIP_LIBRARIES} - ${GCRYPT_LIBRARIES} - ${GNUTLS_LIBRARIES} - ${SMI_LIBRARIES} +set(VERSION_INFO_LIBS ${ZLIB_LIBRARIES} - ${LZ4_LIBRARIES} - ${SNAPPY_LIBRARIES} - ${M_LIBRARIES} - ${WINSPARKLE_LIBRARIES} ) if(WIN32) @@ -2165,13 +2151,15 @@ if(BUILD_wireshark AND QT_FOUND) ${QT_LIBRARIES} ${GTHREAD2_LIBRARIES} wscodecs - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ${APPLE_APPLICATION_SERVICES_LIBRARY} ${APPLE_APPKIT_LIBRARY} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ${NL_LIBRARIES} ${WIN_VERSION_LIBRARY} + ${WINSPARKLE_LIBRARIES} ) add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES}) @@ -2284,9 +2272,11 @@ if(BUILD_tshark) capchild caputils wiretap - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} + ${M_LIBRARIES} ) set(tshark_FILES capture_opts.c @@ -2308,7 +2298,8 @@ if(BUILD_tfshark) set(tfshark_LIBS ui wiretap - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ) @@ -2330,7 +2321,8 @@ if(BUILD_rawshark AND PCAP_FOUND) caputils ui wiretap - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ) @@ -2351,7 +2343,8 @@ if(BUILD_sharkd) ui wscodecs wiretap - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ) @@ -2366,6 +2359,10 @@ if(BUILD_sharkd) add_dependencies(sharkd version) set_extra_executable_properties(sharkd "Executables") target_link_libraries(sharkd ${sharkd_LIBS}) + if(WIN32) + target_link_libraries(sharkd "ws2_32.lib") + endif(WIN32) + install(TARGETS sharkd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -2373,7 +2370,8 @@ if(BUILD_dftest) set(dftest_LIBS ui wiretap - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ) set(dftest_FILES dftest.c diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt index c743bbd127..a4f75d1f1d 100644 --- a/caputils/CMakeLists.txt +++ b/caputils/CMakeLists.txt @@ -47,6 +47,12 @@ add_library(caputils STATIC ${CAPUTILS_SRC} ) +target_link_libraries(caputils PUBLIC ${PCAP_LIBRARIES}) + +if(WIN32) + target_link_libraries(caputils PRIVATE "iphlpapi.lib") +endif(WIN32) + set_target_properties(caputils PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}" FOLDER "Libs") diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 9f03a1f8f2..ff9ca8f2d9 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -378,6 +378,7 @@ target_link_libraries(epan ${SNAPPY_LIBRARIES} ${WIN_PSAPI_LIBRARY} ${LIBXML2_LIBRARIES} + ${ZLIB_LIBRARIES} ) target_include_directories(epan diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt index 6bc57500e3..6eb19d601f 100644 --- a/fuzz/CMakeLists.txt +++ b/fuzz/CMakeLists.txt @@ -28,7 +28,8 @@ set(FUZZ_MEDIA_TYPE_DISSECTORS json) set(fuzzshark_LIBS wiretap - ${LIBEPAN_LIBS} + epan + ${VERSION_INFO_LIBS} ) if(OSS_FUZZ) if("$ENV{LIB_FUZZING_ENGINE}" STREQUAL "") diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index a627950baf..d9b1ce6623 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -106,13 +106,6 @@ set_source_files_properties( COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) -set(wiretap_LIBS - ${GLIB2_LIBRARIES} - ${GMODULE2_LIBRARIES} - ${ZLIB_LIBRARIES} - wsutil -) - add_library(wiretap ${WIRETAP_FILES} ${CMAKE_BINARY_DIR}/image/wiretap.rc @@ -153,7 +146,13 @@ add_custom_command(OUTPUT libwiretap.abi.tar.gz COMMAND rm -rf ${ABICHECK_TMPDIR} ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps DEPENDS ${HEADERS} wiretap) -target_link_libraries(wiretap ${wiretap_LIBS}) +target_link_libraries(wiretap + PUBLIC + wsutil + ${GLIB2_LIBRARIES} + PRIVATE + ${ZLIB_LIBRARIES} +) install(TARGETS wiretap EXPORT WiresharkTargets diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index c49d1c7b9a..25f32523a3 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -221,21 +221,6 @@ if(APPLE) FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation) endif() -set(wsutil_LIBS - ${CMAKE_DL_LIBS} - ${APPLE_CORE_FOUNDATION_LIBRARY} - ${GMODULE2_LIBRARIES} - ${GLIB2_LIBRARIES} - ${GCRYPT_LIBRARIES} - ${ZLIB_LIBRARIES} - ${WIN_WSOCK32_LIBRARY} - ${GNUTLS_LIBRARIES} -) - -IF(WIN32) - set(wsutil_LIBS ${wsutil_LIBS} "iphlpapi.lib" "ws2_32.lib") -ENDIF(WIN32) - set_source_files_properties( ${WSUTIL_FILES} PROPERTIES @@ -290,7 +275,20 @@ add_custom_command(OUTPUT libwsutil.abi.tar.gz COMMAND rm -rf ${ABICHECK_TMPDIR} ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps DEPENDS ${HEADERS} wsutil) -target_link_libraries(wsutil ${wsutil_LIBS}) +target_link_libraries(wsutil + PUBLIC + ${CMAKE_DL_LIBS} + ${APPLE_CORE_FOUNDATION_LIBRARY} + ${GMODULE2_LIBRARIES} + ${GLIB2_LIBRARIES} + ${GCRYPT_LIBRARIES} + ${WIN_WSOCK32_LIBRARY} + ${GNUTLS_LIBRARIES} +) + +if(WIN32) + target_link_libraries(wsutil PRIVATE "iphlpapi.lib" "ws2_32.lib") +endif(WIN32) install(TARGETS wsutil EXPORT WiresharkTargets |