Dissect additional information parameters for Result object
[metze/wireshark/wip.git] / CMakeLists.txt
index c6e314b641c03a0db90f7ab071b293c4581f14a5..e493ded9ce2533e402b3efcccdbfb6de04623dd0 100644 (file)
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-project(Wireshark C)
+project(Wireshark C CXX)
 
 cmake_minimum_required(VERSION 2.6)
 set(CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
 # Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
-#if(COMMAND cmake_policy)
+if(COMMAND cmake_policy)
+       # Backward compatibility for versions < 2.6.3
+       cmake_policy(SET CMP0011 OLD)
 #      cmake_policy(SET CMP0015 NEW)
-#endif(COMMAND cmake_policy)
-
-# set(PROJECT_VERSION "1.3.4-rc5")
-# set(PROJECT_VERSION "1.3.4rc5")
-# set(PROJECT_VERSION "1.3.4")
-# If not set, copy over Wireshark version from configure.in AC_INIT
-if(NOT PROJECT_VERSION)
+endif(COMMAND cmake_policy)
+
+# set(PROJECT_MAJOR_VERSION 1)
+# set(PROJECT_MINOR_VERSION 9)
+# set(PROJECT_PATCH_VERSION 0)
+# set(PROJECT_VERSION_EXTENSION "-rc5")
+# If not set, copy over Wireshark version from configure.ac
+if(NOT PROJECT_MAJOR_VERSION)
+       file(STRINGS
+               ${CMAKE_SOURCE_DIR}/configure.ac
+               PROJECT_MAJOR_VERSION_TMP
+               REGEX "^m4_define\\(\\[?version_major\\]?, *\\[?[0-9]+\\]?\\)"
+       )
+       file(STRINGS
+               ${CMAKE_SOURCE_DIR}/configure.ac
+               PROJECT_MINOR_VERSION_TMP
+               REGEX "^m4_define\\(\\[?version_minor\\]?, *\\[?[0-9]+\\]?\\)"
+       )
        file(STRINGS
-               ${CMAKE_SOURCE_DIR}/configure.in
-               VERSIONLINE
-               REGEX "\\(wireshark, .*\\)"
+               ${CMAKE_SOURCE_DIR}/configure.ac
+               PROJECT_PATCH_VERSION_TMP
+               REGEX "^m4_define\\(\\[?version_micro\\]?, *\\[?[0-9]+\\]?\\)"
        )
-       string(REGEX REPLACE ".*\\(wireshark, (.*)\\).*"
+       # XXX pull VERSION_EXTENSION out of configure.ac ?
+
+       string(REGEX REPLACE "m4_define\\(\\[?version_major\\]?, *\\[?([0-9]+)\\]?\\)"
+               "\\1"
+               PROJECT_MAJOR_VERSION
+               ${PROJECT_MAJOR_VERSION_TMP}
+       )
+       string(REGEX REPLACE "m4_define\\(\\[?version_minor\\]?, *\\[?([0-9]+)\\]?\\)"
                "\\1"
-               PROJECT_VERSION
-               ${VERSIONLINE}
+               PROJECT_MINOR_VERSION
+               ${PROJECT_MINOR_VERSION_TMP}
+       )
+       string(REGEX REPLACE "m4_define\\(\\[?version_micro\\]?, *\\[?([0-9]+)\\]?\\)"
+               "\\1"
+               PROJECT_PATCH_VERSION
+               ${PROJECT_PATCH_VERSION_TMP}
        )
 endif()
-string(REGEX REPLACE "([0-9]+)\\..*"
-       "\\1"
-       PROJECT_MAJOR_VERSION
-       ${PROJECT_VERSION}
-)
-string(REGEX REPLACE ".*\\.([0-9]+)\\..*"
-       "\\1"
-       PROJECT_MINOR_VERSION
-       ${PROJECT_VERSION}
-)
-string(REGEX REPLACE ".*\\..*\\.([0-9]+).*"
-       "\\1"
-       PROJECT_PATCH_VERSION
-       ${PROJECT_VERSION}
-)
-string(REGEX REPLACE ".*\\..*\\.[0-9]+(.*)"
-       "\\1"
-       PROJECT_VERSION_EXTENSION
-       ${PROJECT_VERSION}
-)
+
+
+if(PROJECT_VERSION_EXTENSION)
+       set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION})
+else()
+       set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
+endif()
+
 message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.")
 
 #Where to find local cmake scripts
@@ -77,8 +90,8 @@ INCLUDE(UseMakeTapReg)
 
 # Under linux the release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG
 
-# Disable this later. Alternative: "make VERBOSE=1"
-set(CMAKE_VERBOSE_MAKEFILE ON)
+# Enable with: "make VERBOSE=1"
+set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 #Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ...
 include(CMakeInstallDirs)
@@ -103,19 +116,25 @@ include(CMakeOptions.txt)
 
 set(WIRESHARK_C_FLAGS
        -O2
+       -g
        -Wall
        -W
        -Wextra
-       -Wdeclaration-after-statement
        -Wendif-labels
        -Wpointer-arith
-       -Wno-pointer-sign
        -Warray-bounds
        -Wcast-align
        -Wformat-security
        -fexcess-precision=fast
 )
 
+set(WIRESHARK_C_ONLY_FLAGS
+       # The following are C only, not C++
+       -Wdeclaration-after-statement
+       -Wno-pointer-sign
+       -Wold-style-definition
+)
+
 set(WIRESHARK_EXTRA_C_FLAGS
        -pedantic
        -Woverflow
@@ -125,7 +144,6 @@ set(WIRESHARK_EXTRA_C_FLAGS
        -Wunreachable-code
        -Wunsafe-loop-optimizations
        -Wno-long-long
-       -Wbad-function-cast
        -Wcast-qual
        -Waddress
        -Warray-bounds
@@ -136,25 +154,36 @@ set(WIRESHARK_EXTRA_C_FLAGS
        -Wpragmas
        -Wredundant-decls
        -Wvla
-       -Wc++-compat
-       -Wjump-misses-init
        # packet-ncp2222.inc prevents this from going into all warnings
        -Wwrite-strings
-       -Wstrict-prototypes
+       # All the registration functions block these for now.
        -Wmissing-declarations
        # Problem with packet-afs.c
        -Wshadow
        # More cleanup needed for this on LP64
        -Wshorten-64-to-32
+
+)
+
+set(WIRESHARK_EXTRA_C_ONLY_FLAGS
+       # The following are C only, not C++
+       -Wbad-function-cast
+       -Wc++-compat
+       -Wjump-misses-init
+       # GLib blocks this for now.
+       -Wstrict-prototypes
+       # All the registration functions block these for now.
+       -Wmissing-prototypes
 )
 
 if(ENABLE_EXTRA_GCC_CHECKS)   # This overrides -Werror
        set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_C_FLAGS})
+       set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_C_ONLY_FLAGS})
 endif()
 
 add_definitions(
-       -DHAVE_CONFIG_H
-       -DPACKAGE=\"wireshark\"
+       -DG_DISABLE_DEPRECATED
+       -DG_DISABLE_SINGLE_INCLUDES
 )
 
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
@@ -167,21 +196,34 @@ foreach(THIS_FLAG ${WIRESHARK_C_FLAGS})
        set(V WS_C_FLAG_VALID${C})
        check_c_compiler_flag(${${F}} ${V})
        if (${${V}})
-               add_definitions(${${F}})
+               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
+               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${F}}")
        endif()
        math(EXPR C "${C} + 1")
 endforeach()
+# Continue increasing C from previous loop
+foreach(THIS_FLAG ${WIRESHARK_C_ONLY_FLAGS})
+       set(F WS_C_FLAG_${C})
+       set(${F} ${THIS_FLAG})
+       set(V WS_C_FLAG_VALID${C})
+       check_c_compiler_flag(${${F}} ${V})
+       if (${${V}})
+               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
+       endif()
+       math(EXPR C "${C} + 1")
+endforeach()
+message(STATUS "C-Flags: ${CMAKE_C_FLAGS}\nCXX-Flags: ${CMAKE_CXX_FLAGS}")
 
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
        check_c_compiler_flag(-Werror WERROR)
 else()
-       set(WERROR 0)
+       unset(WERROR)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
-       add_definitions( -D_U_=__attribute__\(\(unused\)\) )
+       set (C_UNUSED "__attribute__((unused))" )
 else()
-       add_definitions( -D_U_=\"\" )
+       set (C_UNUSED "" )
 endif()
 
 set(WIRESHARK_LD_FLAGS
@@ -221,85 +263,118 @@ endif()
 # - set HAVE_XXX
 
 #The minimum package list
-set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGELIST})
+set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
+set(GLIB2_FIND_REQUIRED)
+set(GLIB2_MIN_VERSION 2.14.0)
+set(GTHREAD2_REQUIRED)
+set(PCAP_REQUIRED)
+set(M_REQUIRED)
+
+set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
+
+if(ENABLE_PCAP)
+       set(PACKAGELIST ${PACKAGELIST} PCAP)
+endif()
 
-#Build the gui ?
+# Build the GTK-GUI?
 if(BUILD_wireshark)
-       set(PACKAGELIST GTK2 ${PACKAGELIST})
-       set(GTK2_OPTIONS COMPONENTS gtk)
-       set(GTK2_DEBUG false)
+       if(ENABLE_GTK3)
+               set(PACKAGELIST ${PACKAGELIST} GTK3)
+       else()
+               set(PACKAGELIST ${PACKAGELIST} GTK2)
+               set(GTK2_OPTIONS COMPONENTS gtk)
+               set(GTK2_FIND_VERSION 2.12)
+               set(GTK2_DEBUG false)
+       endif()
+endif()
+
+# Build the Qt GUI?
+if(BUILD_qtshark)
+       set(PACKAGELIST ${PACKAGELIST} QT)
+       # set(QT_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
 endif()
 
 # SMI SNMP
 if(ENABLE_SMI)
-       set(PACKAGELIST SMI ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} SMI)
 endif()
 
 # GNU crypto
 if(ENABLE_GCRYPT)
-       set(PACKAGELIST GCRYPT ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GCRYPT)
 endif()
 
 # GNU SSL/TLS support
 if(ENABLE_GNUTLS)
-       set(PACKAGELIST GNUTLS ${PACKAGELIST})
-endif()
-
-# Regular expressions lib
-if(ENABLE_PCRE)
-       set(PACKAGELIST PCRE ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GNUTLS)
 endif()
 
 # Kerberos
 if(ENABLE_KERBEROS)
-       set(PACKAGELIST KERBEROS ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} KERBEROS)
 endif()
 
 # Portable audio
 if(ENABLE_PORTAUDIO)
-       set(PACKAGELIST PORTAUDIO ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} PORTAUDIO)
 endif()
 
 
 # Prefer c-ares over adns
 if(ENABLE_CARES)        # C Asynchronouse resolver
-       set(PACKAGELIST CARES ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} CARES)
 elseif(ENABLE_ADNS)     # Gnu asynchronous DNS
-       set(PACKAGELIST ADNS ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} ADNS)
 endif()
 
 # Zlib compression
 if(ENABLE_ZLIB)
-       set(PACKAGELIST ZLIB ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} ZLIB)
 endif()
 
 # Lua 5.1 dissectors
 if(ENABLE_LUA)
-       set(PACKAGELIST LUA ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} LUA)
 endif()
 
 # GeoIP address resolving
 if(ENABLE_GEOIP)
-       set(PACKAGELIST GEOIP ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GEOIP)
+endif()
+
+if(ENABLE_NETLINK)
+       set(PACKAGELIST ${PACKAGELIST} NL)
 endif()
 
 # Capabilities
 if(ENABLE_CAP)
-       set(PACKAGELIST CAP ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} CAP)
 endif()
 
 if(ENABLE_PYTHON)
-       set(PACKAGELIST PYTHON ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} PYTHON)
 endif()
 
-set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
+set(PACKAGELIST ${PACKAGELIST} YAPP)
+
+set(PACKAGELIST ${PACKAGELIST} POD)
+
+
+set(PROGLIST text2pcap mergecap capinfos editcap reordercap dumpcap)
 
 #Let's loop the package list
 foreach(PACKAGE ${PACKAGELIST})
+       if(${PACKAGE} STREQUAL "QT")
+               set(PACKAGE_NAME "Qt4")
+       else()
+               set(PACKAGE_NAME ${PACKAGE})
+       endif()
        if(${PACKAGE}_OPTIONS)
-               find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
+               find_package(${PACKAGE_NAME} ${${PACKAGE}_OPTIONS})
+       elseif(${PACKAGE}_REQUIRED)
+               find_package(${PACKAGE_NAME} REQUIRED)
        else()
-               find_package(${PACKAGE} REQUIRED)
+               find_package(${PACKAGE_NAME})
        endif()
        message(${PACKAGE}_FOUND)
        if (${PACKAGE}_FOUND)
@@ -310,8 +385,6 @@ foreach(PACKAGE ${PACKAGELIST})
        endif()
 endforeach()
 
-find_package(YAPP)
-
 #packaging
 include(CPackConfig.txt)
 
@@ -321,7 +394,7 @@ if(HAVE_LIBPYTHON)
 endif()
 if(HAVE_LIBLUA)
        set(HAVE_LUA_H 1)
-       set(HAVE_LUA_5_1 1)
+       set(HAVE_LUA 1)
 endif()
 if(HAVE_LIBKERBEROS)
        set(HAVE_KERBEROS 1)
@@ -341,10 +414,24 @@ endif()
 if(ENABLE_AIRPCAP)
        set(HAVE_AIRPCAP 1)
 endif()
+if(HAVE_LIBNL AND ENABLE_AIRPCAP)
+       message(ERROR "Airpcap and Libnl support are mutually exclusive")
+endif()
+# No matter which version of GTK is present
+if(GTK2_FOUND OR GTK3_FOUND)
+       set(GTK_FOUND ON)
+endif()
 # That's the name autofoo uses
 if(HAVE_LIBZLIB)
        set(HAVE_LIBZ 1)
 endif()
+# QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic:
+if(QT_FOUND)
+       include(${QT_USE_FILE})
+       include_directories(${QT_INCLUDE_DIR})
+       message(STATUS "QT includes: ${QT_INCLUDE_DIR}")
+       message(STATUS "QT libs: ${QT_LIBRARIES}")
+endif()
 
 include(ConfigureChecks.cmake)
 
@@ -361,19 +448,17 @@ if(ENABLE_PLUGINS)
                plugins/asn1
                plugins/docsis
                plugins/ethercat
-               plugins/giop
                plugins/gryphon
-               plugins/interlink
                plugins/irda
                plugins/m2m
                plugins/mate
                plugins/opcua
                plugins/profinet
-               plugins/sercosiii
                plugins/stats_tree
                plugins/unistim
                plugins/wimax
                plugins/wimaxasncp
+               plugins/wimaxmacphy
        )
 # It seems this stuff doesn't build with autofoo either...
 #      if(YAPP_FOUND)
@@ -392,16 +477,34 @@ endforeach()
 
 add_subdirectory( codecs )
 add_subdirectory( epan )
-add_subdirectory( gtk )
 add_subdirectory( tools/lemon )
 add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
+if((BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND))
+       add_subdirectory( ui )
+endif()
+
+if(BUILD_wireshark AND GTK_FOUND)
+       add_subdirectory( ui/gtk )
+endif()
+
+if(BUILD_qtshark AND QT_FOUND)
+       add_subdirectory( ui/qt )
+endif()
+
+
+# Basedir where to install guides
+set(DOC_DIR "$ENV{docdir}" CACHE FILEPATH "Installation directory for ug and dg pdfs.")
+message(STATUS "docdir: ${DOC_DIR}")
+
 if(ENABLE_GUIDES)
        add_subdirectory( docbook )
 endif()
 
-find_package(POD)
+if(ENABLE_PCAP_NG_DEFAULT)
+       set(PCAP_NG_DEFAULT 1)
+endif()
 
 #Platform specific
 if(UNIX)
@@ -418,26 +521,28 @@ endif()
 if(WIN32)
        add_definitions(-D_NEED_VAR_IMPORT_)
        set(WS_VAR_IMPORT "__declspec(dllimport) extern")
+       set(WS_MSVC_NORETURN "__declspec(noreturn)")
 
        # Disable deprecation
        if(MSVC80 OR MSVC90)
                add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
        endif()
+else()
+       set(WS_MSVC_NORETURN " ")
 endif()
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
 
-# Basedir where to install guides
-set(DOC_DIR "$ENV{docdir}")
-message(STATUS "docdir: ${DOC_DIR}")
-
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
+#FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
 PRINT_ENABLED_FEATURES()
 PRINT_DISABLED_FEATURES()
 
 link_directories(
-       ${CMAKE_BINARY_DIR}/gtk
+       ${CMAKE_BINARY_DIR}/ui
+       ${CMAKE_BINARY_DIR}/ui/gtk
+       ${CMAKE_BINARY_DIR}/ui/qt
        ${CMAKE_BINARY_DIR}/codecs
        ${CMAKE_BINARY_DIR}/epan
        ${CMAKE_BINARY_DIR}/wiretap
@@ -462,10 +567,6 @@ ADD_CUSTOM_COMMAND(
                ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 )
 
-register_tap_files(tshark-tap-register.c
-       ${TSHARK_TAP_SRC}
-)
-
 ADD_CUSTOM_COMMAND(
        OUTPUT  ps.c
        COMMAND ${PYTHON_EXECUTABLE}
@@ -496,7 +597,6 @@ set(WTAP_PLUGIN_SOURCES
 )
 
 set(SHARK_COMMON_CAPTURE_SRC
-       capture_errs.c
        capture_ifinfo.c
        capture_ui_utils.c
 )
@@ -507,50 +607,58 @@ set(WIRESHARK_COMMON_SRC
        cfile.c
        clopts_common.c
        disabled_protos.c
+       frame_data_sequence.c
        packet-range.c
        print.c
        ps.c
        svnversion.h
        sync_pipe_write.c
        timestats.c
-       util.c
        tap-megaco-common.c
        tap-rtp-common.c
        version_info.c
 )
 
 set(TSHARK_TAP_SRC
-       tap-afpstat.c
-       tap-ansi_astat.c
-       tap-bootpstat.c
-       tap-camelcounter.c
-       tap-camelsrt.c
-       tap-comparestat.c
-       tap-dcerpcstat.c
-       tap-diameter-avp.c
-       tap-funnel.c
-       tap-gsm_astat.c
-       tap-h225counter.c
-       tap-h225rassrt.c
-       tap-httpstat.c
-       tap-iostat.c
-       tap-iousers.c
-       tap-mgcpstat.c
-       tap-megacostat.c
-       tap-protocolinfo.c
-       tap-protohierstat.c
-       tap-radiusstat.c
-       tap-rpcstat.c
-       tap-rpcprogs.c
-       tap-rtp.c
-       tap-scsistat.c
-       tap-sctpchunkstat.c
-       tap-sipstat.c
-       tap-smbsids.c
-       tap-smbstat.c
-       tap-stats_tree.c
-       tap-sv.c
-       tap-wspstat.c
+       ui/cli/tap-afpstat.c
+       ui/cli/tap-ansi_astat.c
+       ui/cli/tap-bootpstat.c
+       ui/cli/tap-camelcounter.c
+       ui/cli/tap-camelsrt.c
+       ui/cli/tap-comparestat.c
+       ui/cli/tap-dcerpcstat.c
+       ui/cli/tap-diameter-avp.c
+       ui/cli/tap-expert.c
+       ui/cli/tap-follow.c
+       ui/cli/tap-funnel.c
+       ui/cli/tap-gsm_astat.c
+       ui/cli/tap-h225counter.c
+       ui/cli/tap-h225rassrt.c
+       ui/cli/tap-hosts.c
+       ui/cli/tap-httpstat.c
+       ui/cli/tap-icmpstat.c
+       ui/cli/tap-icmpv6stat.c
+       ui/cli/tap-iostat.c
+       ui/cli/tap-iousers.c
+       ui/cli/tap-macltestat.c
+       ui/cli/tap-mgcpstat.c
+       ui/cli/tap-megacostat.c
+       ui/cli/tap-protocolinfo.c
+       ui/cli/tap-protohierstat.c
+       ui/cli/tap-radiusstat.c
+       ui/cli/tap-rlcltestat.c
+       ui/cli/tap-rpcstat.c
+       ui/cli/tap-rpcprogs.c
+       ui/cli/tap-rtp.c
+       ui/cli/tap-rtspstat.c
+       ui/cli/tap-scsistat.c
+       ui/cli/tap-sctpchunkstat.c
+       ui/cli/tap-sipstat.c
+       ui/cli/tap-smbsids.c
+       ui/cli/tap-smbstat.c
+       ui/cli/tap-stats_tree.c
+       ui/cli/tap-sv.c
+       ui/cli/tap-wspstat.c
 )
 
 set(INSTALL_DIRS
@@ -576,8 +684,10 @@ set(INSTALL_FILES
        ipmap.html
        manuf
        ${CMAKE_BINARY_DIR}/mergecap.html
+       pdml2html.xsl
        ${CMAKE_BINARY_DIR}/randpkt.html
        ${CMAKE_BINARY_DIR}/rawshark.html
+       ${CMAKE_BINARY_DIR}/reordercap.html
        services
        smi_modules
        ${CMAKE_BINARY_DIR}/text2pcap.html
@@ -593,7 +703,6 @@ set(LIBEPAN_LIBS
 #              @SSL_LIBS@      # -lcrypto
                epan
 #              $(plugin_ldadd) # in case of static
-               ${PCRE_LIBRARIES}
                ${PCAP_LIBRARIES}
                ${CARES_LIBRARIES}
                ${ADNS_LIBRARIES}
@@ -608,19 +717,9 @@ set(LIBEPAN_LIBS
                ${M_LIBRARIES}
 )
 
-if(BUILD_wireshark)
-       set(wireshark_LIBS
-               ui
-               ${GTK2_LIBRARIES}
-               codecs
-               ${PORTAUDIO_LIBRARIES}
-               ${LIBEPAN_LIBS}
-               ${APPLE_CORE_SERVICES_LIBRARY}
-               ${APPLE_COCOA_LIBRARY}
-       )
+if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
        set(wireshark_FILES
                airpcap_loader.c
-               alert_box.c
                capture.c
                capture_info.c
                capture_opts.c
@@ -630,13 +729,35 @@ if(BUILD_wireshark)
                fileset.c
                filters.c
                g711.c
+               iface_monitor.c
                merge.c
                proto_hier_stats.c
+               recent.c
                summary.c
                tempfile.c
+               u3.c
+               ws80211_utils.c
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
        )
+endif()
+
+if(BUILD_wireshark AND GTK_FOUND)
+       set(wireshark_LIBS
+               gtkui
+               ui
+               ${GTK2_LIBRARIES}
+               ${GTK3_LIBRARIES}
+               ${GTHREAD2_LIBRARIES}
+               codecs
+               ${PORTAUDIO_LIBRARIES}
+               ${LIBEPAN_LIBS}
+               ${APPLE_CORE_SERVICES_LIBRARY}
+               ${APPLE_COCOA_LIBRARY}
+               ${NL_LIBRARIES}
+       )
+       # qtshark and wireshark share wireshark_FILES
+
        add_executable(wireshark ${wireshark_FILES})
        add_dependencies(wireshark svnversion)
        set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -644,6 +765,32 @@ if(BUILD_wireshark)
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
+if(BUILD_qtshark AND QT_FOUND)
+       set(qtshark_LIBS
+               qtui
+               ui
+               ${QT_LIBRARIES}
+               ${GTHREAD2_LIBRARIES}
+               codecs
+               ${PORTAUDIO_LIBRARIES}
+               ${LIBEPAN_LIBS}
+               ${APPLE_CORE_SERVICES_LIBRARY}
+               ${APPLE_COCOA_LIBRARY}
+               ${NL_LIBRARIES}
+       )
+       # qtshark and wireshark share wireshark_FILES
+
+       add_executable(qtshark ${wireshark_FILES})
+       add_dependencies(qtshark svnversion)
+       set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       target_link_libraries(qtshark ${qtshark_LIBS})
+       install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+register_tap_files(tshark-tap-register.c
+       ${TSHARK_TAP_SRC}
+)
+
 if(BUILD_tshark)
        set(tshark_LIBS
                ${LIBEPAN_LIBS}
@@ -655,6 +802,7 @@ if(BUILD_tshark)
                tempfile.c
                tshark-tap-register.c
                tshark.c
+               ui/util.c
                ${TSHARK_TAP_SRC}
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
@@ -666,7 +814,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}
@@ -674,6 +822,7 @@ if(BUILD_rawshark)
        set(rawshark_FILES
                ${WIRESHARK_COMMON_SRC}
                rawshark.c
+               ui/util.c
        )
        add_executable(rawshark ${rawshark_FILES})
        add_dependencies(rawshark svnversion)
@@ -688,7 +837,7 @@ if(BUILD_dftest)
        )
        set(dftest_FILES
                dftest.c
-               util.c
+               ui/util.c
        )
        add_executable(dftest ${dftest_FILES})
        set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -747,6 +896,7 @@ if(BUILD_mergecap)
                mergecap.c
                merge.c
                svnversion.h
+               ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(mergecap ${mergecap_FILES})
        add_dependencies(mergecap svnversion)
@@ -755,9 +905,27 @@ if(BUILD_mergecap)
        install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
+if(BUILD_reordercap)
+       set(reordercap_LIBS
+               wiretap
+               ${ZLIB_LIBRARIES}
+       )
+       set(reordercap_FILES
+               reordercap.c
+               svnversion.h
+               ${WTAP_PLUGIN_SOURCES}
+       )
+       add_executable(reordercap ${reordercap_FILES})
+       add_dependencies(reordercap svnversion)
+       set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       target_link_libraries(reordercap ${reordercap_LIBS})
+       install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
 if(BUILD_capinfos)
        set(capinfos_LIBS
                wiretap
+               wsutil
                ${ZLIB_LIBRARIES}
                ${GCRYPT_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
@@ -780,7 +948,7 @@ if(BUILD_editcap)
        )
        set(editcap_FILES
                editcap.c
-               epan/crypt/crypt-md5.c
+               epan/crypt/md5.c
                epan/nstime.c
                ${WTAP_PLUGIN_SOURCES}
        )
@@ -791,16 +959,19 @@ if(BUILD_editcap)
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
-if(BUILD_dumpcap)
+if(BUILD_dumpcap AND PCAP_FOUND)
        set(dumpcap_LIBS
-               wiretap
 #              @INET_NTOP_LO@
+               wsutil
                ${PCAP_LIBRARIES}
                ${CAP_LIBRARIES}
 #              @SOCKET_LIBS@
 #              @NSL_LIBS@
+               ${GLIB2_LIBRARIES}
+               ${GTHREAD2_LIBRARIES}
                ${ZLIB_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
+               ${NL_LIBRARIES}
        )
        set(dumpcap_FILES
                svnversion.h
@@ -815,6 +986,7 @@ if(BUILD_dumpcap)
                sync_pipe_write.c
                tempfile.c
                version_info.c
+               ws80211_utils.c
                ${PLATFORM_SRC}
        )
        add_executable(dumpcap ${dumpcap_FILES})
@@ -864,6 +1036,7 @@ pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2wrs 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/mergecap 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/randpkt 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/rawshark 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/reordercap 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
 pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
 pod2manhtml( wireshark 1 )
@@ -881,6 +1054,7 @@ add_custom_target(
                mergecap.html
                randpkt.html
                rawshark.html
+               reordercap.html
                text2pcap.html
                tshark.html
                wireshark.html
@@ -896,6 +1070,7 @@ set(MAN1_FILES
        ${CMAKE_BINARY_DIR}/mergecap.1
        ${CMAKE_BINARY_DIR}/randpkt.1
        ${CMAKE_BINARY_DIR}/rawshark.1
+       ${CMAKE_BINARY_DIR}/reordercap.1
        ${CMAKE_BINARY_DIR}/text2pcap.1
        ${CMAKE_BINARY_DIR}/tshark.1
        ${CMAKE_BINARY_DIR}/wireshark.1
@@ -960,3 +1135,20 @@ install(
        PATTERN "Makefile.*" EXCLUDE
        PATTERN "faq.py" EXCLUDE
 )
+
+
+if(DOC_DIR)
+       message(STATUS "Docdir install: ${DOC_DIR}")
+       INSTALL(
+               DIRECTORY
+                       ${CMAKE_BINARY_DIR}/docbook/
+               DIRECTORY_PERMISSIONS
+                       OWNER_EXECUTE OWNER_WRITE OWNER_READ
+                       GROUP_EXECUTE GROUP_READ
+                       WORLD_EXECUTE WORLD_READ
+               DESTINATION
+                       ${DOC_DIR}/guides
+               FILES_MATCHING
+               PATTERN "*.pdf"
+       )
+endif()