diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-11-27 19:37:33 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-11-29 02:21:51 +0000 |
| commit | 40352d75cd187201b46c13acc0e03c0d73785e51 (patch) | |
| tree | b1e3c57443c88fe782e562d8c0c066d4d9f6af63 /wiretap/CMakeLists.txt | |
| parent | 332df929a9966fda2cd3aa30a5a107e5b2bfa360 (diff) | |
CMake: Fix some transitive link dependencies
libwireshark and libwiretap have their INTERFACE link dependencies
changed to the required set.
libwsutil keeps a default public visibility. Further work may
show some unneeded link requirements.
The executable dependencies are adjusted accordingly.
Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3
Reviewed-on: https://code.wireshark.org/review/30815
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wiretap/CMakeLists.txt')
| -rw-r--r-- | wiretap/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
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 |