aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-12 21:13:00 +0000
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-12 21:13:00 +0000
commit3ba728fd3d26ced3bf100377b4a73f3da580deb2 (patch)
tree457b4c51f03e94db2be21802f983dfd2be2adc6c /CMakeLists.txt
parentc2bc525e2ffb2c02a683e6b34b1bf7e910c2889b (diff)
Play catch up with recent configure.in changes:
- Link dumpcap (and only dumpcap) against gthread - gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1 - Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..." git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37103 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659868f442..1364f7c562 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,6 +236,11 @@ if(BUILD_wireshark)
set(GTK2_DEBUG false)
endif()
+if(BUILD_dumpcap)
+ set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
+ set(GHTREAD2_REQUIRED)
+endif()
+
# SMI SNMP
if(ENABLE_SMI)
set(PACKAGELIST ${PACKAGELIST} SMI)
@@ -820,6 +825,7 @@ if(BUILD_dumpcap)
# @SOCKET_LIBS@
# @NSL_LIBS@
${GLIB2_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
${ZLIB_LIBRARIES}
${APPLE_COCOA_LIBRARY}
)