diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-23 16:48:41 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-23 23:58:29 +0000 |
| commit | 213189ef9e7bbd851e145e1cfb1067c7b2b72de8 (patch) | |
| tree | 67bc7b5ce4a1e36fd16203d12fd184a0aee38965 /CMakeLists.txt | |
| parent | e22d3c9b744af8fa49806f1cde2100be85cc58cc (diff) | |
Move the routines to talk to dumpcap into a static libcapchild.
This pulls some stuff out of the top-level directory, and means we don't
have to build them once for every program using them.
Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5
Reviewed-on: https://code.wireshark.org/review/2591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa6265ac0..7eff37eff0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -735,6 +735,7 @@ foreach(PLUGIN_DIR ${PLUGIN_SRC_DIRS}) endforeach() add_subdirectory( asn1 EXCLUDE_FROM_ALL ) +add_subdirectory( capchild ) add_subdirectory( codecs ) add_subdirectory( epan ) add_subdirectory( filetap ) @@ -861,6 +862,7 @@ link_directories( ${CMAKE_BINARY_DIR}/ui ${CMAKE_BINARY_DIR}/ui/gtk ${CMAKE_BINARY_DIR}/ui/qt + ${CMAKE_BINARY_DIR}/capchild ${CMAKE_BINARY_DIR}/codecs ${CMAKE_BINARY_DIR}/epan ${CMAKE_BINARY_DIR}/filetap @@ -922,8 +924,6 @@ set(SHARK_COMMON_SRC # sources common for wireshark and tshark, but not rawshark; # these are for programs that capture traffic by running dumpcap set(SHARK_COMMON_CAPTURE_SRC - capture_ifinfo.c - capture_sync.c capture_ui_utils.c ) @@ -1055,6 +1055,7 @@ if(BUILD_wireshark AND GTK_FOUND) set(wireshark_LIBS gtkui ui + capchild ${GTK2_LIBRARIES} ${GTK3_LIBRARIES} ${GTHREAD2_LIBRARIES} @@ -1081,6 +1082,7 @@ if(BUILD_qtshark AND QT_FOUND) set(qtshark_LIBS qtui ui + capchild ${QT_LIBRARIES} ${GTHREAD2_LIBRARIES} codecs @@ -1108,6 +1110,7 @@ register_tap_files(tshark-tap-register.c if(BUILD_tshark) set(tshark_LIBS ui + capchild ${LIBEPAN_LIBS} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} |