diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-11-12 10:55:58 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-11-12 18:56:33 +0000 |
| commit | e38c89d3a7aef37c404a616c493ca31c10a5afbb (patch) | |
| tree | 7ba38d465250c59595acbe018555e967d67f65e0 | |
| parent | 5be009d48d4ae869347309b6713d1e3a206e0398 (diff) | |
Link with ZLIB_LIBRARIES if you link with wiretap.
Wiretap may use zlib; if it does, ZLIB_LIBRARIES is set to refer to
zlib. On UN*X, you may be able to get away with linking a
dynamically-linked shared library with other dynamically-linked shared
libraries and not linking programs linked *with* that shared library
with those other shared libraries, but that may not work on Windows.
We link most programs that use wiretap with ZLIB_LIBRARIES; do so with
androiddump and randpktdump as well.
Bug: 14207
Change-Id: I8e94197e06f5fd0ff8c95aa509dbcc2ff2a44cd4
Reviewed-on: https://code.wireshark.org/review/24389
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 87f1b78e5a..4c32f96e76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2779,13 +2779,14 @@ if(ENABLE_EXTCAP AND BUILD_androiddump) ${PCAP_LIBRARIES} ) else() - message(FATAL_ERROR "You try to build androiddump with libpcap but do not have it") + message(FATAL_ERROR "You are trying to build androiddump with libpcap but do not have it") endif() else() set(androiddump_LIBS ui wiretap ${GLIB2_LIBRARIES} + ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ) endif() @@ -2874,6 +2875,7 @@ if(ENABLE_EXTCAP AND BUILD_randpktdump) ui wiretap ${GLIB2_LIBRARIES} + ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ) set(randpktdump_FILES |