Add a tap for showing all expert items.

[metze/wireshark/wip.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10719b083a104042d831a7f1a384c214c07d240f..7f1bf637a6f0223b5db4c8f47d63c85bae0df913 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,7 +227,7 @@ endif()
 # - set HAVE_XXX
 
 #The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST GLIB2 GMODULE2 M LEX YACC Perl SH PythonInterp)
 set(GLIB2_FIND_REQUIRED)
 set(GLIB2_MIN_VERSION 2.14.0)
 set(PCAP_REQUIRED)
@@ -235,6 +235,10 @@ set(M_REQUIRED)
 
 set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
 
+if(ENABLE_PCAP)
+       set(PACKAGELIST ${PACKAGELIST} PCAP)
+endif()
+
 #Build the gui ?
 if(BUILD_wireshark)
        if(ENABLE_GTK3)
@@ -572,6 +576,7 @@ set(TSHARK_TAP_SRC
        tap-comparestat.c
        tap-dcerpcstat.c
        tap-diameter-avp.c
+       tap-expert.c
        tap-funnel.c
        tap-gsm_astat.c
        tap-h225counter.c
@@ -720,7 +725,7 @@ if(BUILD_tshark)
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
-if(BUILD_rawshark)
+if(BUILD_rawshark AND PCAP_FOUND)
        set(rawshark_LIBS
                ${LIBEPAN_LIBS}
                ${APPLE_COCOA_LIBRARY}
@@ -845,7 +850,7 @@ if(BUILD_editcap)
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
-if(BUILD_dumpcap)
+if(BUILD_dumpcap AND PCAP_FOUND)
        set(dumpcap_LIBS
 #              @INET_NTOP_LO@
                wsutil