column-utils: add space to improve readability.
[metze/wireshark/wip.git] / CMakeLists.txt
index dde0c995a5298ecd702084aeca740d10dcc1f447..667fee4bc74a793d9acf3414f46572a491c07f5a 100644 (file)
 
 project(Wireshark C CXX)
 
+# Updated by make-version.pl
+set(GIT_REVISION 0)
+set(PROJECT_MAJOR_VERSION 2)
+set(PROJECT_MINOR_VERSION 3)
+set(PROJECT_PATCH_VERSION 0)
+set(PROJECT_BUILD_VERSION ${GIT_REVISION})
+set(PROJECT_VERSION_EXTENSION "")
+
+if(DEFINED ENV{WIRESHARK_VERSION_EXTRA})
+       set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
+endif()
+
+set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
+
 message(STATUS "Generating build using CMake ${CMAKE_VERSION}")
 if(WIN32)
        # Needed for proper Qt linking. See
@@ -28,7 +42,7 @@ if(WIN32)
        # 3.1.3 is the currently supported version
        cmake_minimum_required(VERSION 3.1.3)
 else()
-       cmake_minimum_required(VERSION 2.8.3)
+       cmake_minimum_required(VERSION 2.8.8)
 endif()
 
 # Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
@@ -174,15 +188,6 @@ endif()
 #Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ...
 include(CMakeInstallDirs)
 
-# Updated by make-version.pl
-set(GIT_REVISION 0)
-set(PROJECT_MAJOR_VERSION 2)
-set(PROJECT_MINOR_VERSION 1)
-set(PROJECT_PATCH_VERSION 0)
-set(PROJECT_BUILD_VERSION ${GIT_REVISION})
-set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
-set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
-
 # Banner shown at top right of Qt welcome screen.
 if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
        set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
@@ -209,7 +214,6 @@ include_directories(
        ${CMAKE_SOURCE_DIR}
        ${CMAKE_SOURCE_DIR}/epan
        ${CMAKE_SOURCE_DIR}/tools/lemon
-       ${CMAKE_SOURCE_DIR}/wiretap
 )
 
 include( CMakeOptions.txt )
@@ -250,7 +254,6 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
                /DWIN32_LEAN_AND_MEAN
                "/DMSC_VER_REQUIRED=${MSC_VER_REQUIRED}"
                /D_CRT_SECURE_NO_DEPRECATE
-               /D_CRT_NONSTDC_NO_DEPRECATE
                # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
                # This avoids conflicts with the C++ standard library.
                /DNOMINMAX
@@ -292,8 +295,9 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
                set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/Zo")
        elseif(MSVC14)
                # /Zo                               Enhanced debugging of optimised code
+               # /utf-8                            Set Source and Executable character sets to UTF-8
                #                                   VS2015(MSVC14): On by default when /Zi or /Z7 used.
-               set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/Zo")
+               set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/Zo" "/utf-8")
        endif()
 
        if(ENABLE_CODE_ANALYSIS)
@@ -304,14 +308,15 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
        #  when compiling Wireshark sources. (Selected from "level 4" warnings).
        ## 4295: array is too small to include a terminating null character
        ## 4189: local variable is initialized but not referenced
-       set(WARNINGS_CFLAGS "/w34295 /w34189")
+       # Disable warnings about about use of flexible array members:
+       ## 4200: nonstandard extension used : zero-sized array in struct/union
+       set(WARNINGS_CFLAGS "/w34295 /w34189 /wd4200")
 
        set(WIRESHARK_COMMON_FLAGS
                ${LOCAL_CFLAGS}
                ${WARNINGS_CFLAGS}
        )
 
-       # Set in Makefile.nmake
        set(WS_LINK_FLAGS "/LARGEADDRESSAWARE /MANIFEST:NO /INCREMENTAL:NO /RELEASE")
 
 else()
@@ -340,15 +345,63 @@ else()
                endif()
        endif()
 
-       set(WIRESHARK_COMMON_FLAGS
+       if(CMAKE_VERSION VERSION_LESS "3.1")
+               # Many modern compilers use c99 by default, but for older ones
+               # (like GCC 4.4.7), -std=gnu99 is required to avoid errors about
+               # use constructs like "for (int i = 0; i < n; i++) ;"
+               #
+               # Older versions of IBM XL C may require -qlanglvl=extc99.
+               # With V7.0, the "xlc" command defaults to C89; with 10.1,
+               # it defaults to C99 (both with IBM syntax extensions).
+               #
+               # HP's manual for HP C/HP-UX B.11.11.04 (the tenth
+               # edition of the manual), for PA-RISC, "documents
+               # new HP C features that support C99 industry standards".
+               # The manual for Version A.06.25 for Itanium mentions an
+               # -AC99 flag to support C99, but says it's the default;
+               # some older versions might require -AC99.
+               #
+               # As of Sun Studio 8, the compiler appears to default
+               # to supporting some C99 language features, but not
+               # C99 library differences from C89; -xc99 will give
+               # you both.  The earlier Sun Forte Developer 6 update 2
+               # might or might not support thosee C99 language features
+               # by default, and doesn't speak of library differences;
+               # if it doesn't support the language features by default,
+               # -xc99 will support them.
+               #
+               if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+                       set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
+               endif()
+       else()
+               #
+               # Current versions of CMake do not support options to
+               # request C99 for XL C, HP C, or Oracle C.  (They may
+               # not be necessary for current versions.)
+               #
+               set(CMAKE_C_STANDARD 99)
+       endif()
+
+       if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+               set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
+                       # avoid "argument unused during compilation" warnings
+                       # (for example, when getting the -gsplit-dwarf option or
+                       # when combining -fwrapv with -fno-strict-overflow)
+                       -Qunused-arguments
+               )
+       else()
+               set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
+                       -fexcess-precision=fast
+               )
+       endif()
+
+       set(COMMON_WARN_FLAGS
                # The following are for C and C++
                # -O<X> and -g get set by the CMAKE_BUILD_TYPE
                -Wall
-               -W
                -Wextra
                -Wendif-labels
                -Wpointer-arith
-               -Warray-bounds
                -Wformat-security
                -fwrapv
                -fno-strict-overflow
@@ -361,28 +414,27 @@ else()
                -Wno-overlength-strings
                -Wno-long-long
                -Wheader-guard
-               -Wunused-const-variable
        )
 
-       set(WIRESHARK_C_ONLY_FLAGS
+       set(C_WARN_FLAGS
                # The following are C only, not C++
                -Wc++-compat
-               -Wdeclaration-after-statement
                -Wshadow
                -Wno-pointer-sign
                -Wold-style-definition
                -Wstrict-prototypes
                -Wlogical-op
                -Wjump-misses-init
+               -Wunused-const-variable
                # The Qt headers generate a ton of shortening errors on 64-bit systems
                # so only enable this for C for now.
                -Wshorten-64-to-32
        )
 
-       set(WIRESHARK_CXX_ONLY_FLAGS
+       set(CXX_WARN_FLAGS
        )
 
-       set(WIRESHARK_EXTRA_COMPILER_COMMON_FLAGS
+       set(COMMON_EXTRA_WARN_FLAGS
                # The following are for C and C++
                -Wpedantic
                #
@@ -437,7 +489,7 @@ else()
                -fno-delete-null-pointer-checks
        )
 
-       set(WIRESHARK_EXTRA_COMPILER_C_ONLY_FLAGS
+       set(C_EXTRA_WARN_FLAGS
                # The following are C only, not C++
                #
                # Due to various places where APIs we don't control
@@ -447,47 +499,13 @@ else()
                -Wbad-function-cast
        )
 
-       set(WIRESHARK_EXTRA_COMPILER_CXX_ONLY_FLAGS
+       set(CXX_EXTRA_WARN_FLAGS
        )
 
-       if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-               set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
-                       # avoid "argument unused during compilation" warnings
-                       # (for example, when getting the -gsplit-dwarf option or
-                       # when combining -fwrapv with -fno-strict-overflow)
-                       -Qunused-arguments
-               )
-
-               set(WIRESHARK_CXX_ONLY_FLAGS ${WIRESHARK_CXX_ONLY_FLAGS}
-               )
-       else()
-               set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
-                       -fexcess-precision=fast
-               )
-
-               set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS}
-               )
-       endif()
-
-       set(WIRESHARK_ASAN_FLAGS
-               # With Clang >= 3.5 Leak detection is enable by default
-               # and no yet all leak is fixed...
-               # use ASAN_OPTIONS=detect_leaks=0 to disable detect_leaks
-               -fsanitize=address
-               -fsanitize=undefined # compile and runtime checks
-               # -fsanitize=float-divide-by-zero
-               # -fsanitize=float-cast-overflow
-               # -fno-sanitize-recover # Abort during runtime
-       )
-
-       if(ENABLE_ASAN)
-               set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_ASAN_FLAGS})
-       endif()
-
        if(ENABLE_EXTRA_COMPILER_WARNINGS)   # This overrides -Werror
-               set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_EXTRA_COMPILER_COMMON_FLAGS})
-               set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_C_ONLY_FLAGS})
-               set(WIRESHARK_CXX_ONLY_FLAGS ${WIRESHARK_CXX_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_CXX_ONLY_FLAGS})
+               set(COMMON_WARN_FLAGS ${COMMON_WARN_FLAGS} ${COMMON_EXTRA_WARN_FLAGS})
+               set(C_WARN_FLAGS ${C_WARN_FLAGS} ${C_EXTRA_WARN_FLAGS})
+               set(CXX_WARN_FLAGS ${CXX_WARN_FLAGS} ${CXX_EXTRA_WARN_FLAGS})
        endif()
 
        add_definitions(
@@ -499,6 +517,9 @@ endif()
 set( C_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_C_ONLY_FLAGS} )
 set( CXX_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_CXX_ONLY_FLAGS} )
 
+set( C_WARN_TESTS ${COMMON_WARN_FLAGS} ${C_WARN_FLAGS} )
+set( CXX_WARN_TESTS ${COMMON_WARN_FLAGS} ${CXX_WARN_FLAGS} )
+
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
@@ -538,10 +559,53 @@ foreach(THIS_FLAG ${CXX_FLAG_TESTS})
 endforeach()
 set(CMAKE_CXX_FLAGS "${ADDED_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 
+foreach(THIS_FLAG ${C_WARN_TESTS})
+       string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} )
+       set(${F} ${THIS_FLAG})
+       set(V C_${F}_VALID)
+       message(STATUS "Checking for c-compiler flag: ${THIS_FLAG}")
+       check_c_compiler_flag("${C_FLAG_TESTS} ${${F}}" ${V})
+       if (${${V}})
+               set(ADDED_WARN_C_FLAGS ${ADDED_WARN_C_FLAGS} ${${F}})
+       endif()
+endforeach()
+set(WS_WARNINGS_C_FLAGS ${ADDED_WARN_C_FLAGS})
+
+foreach(THIS_FLAG ${CXX_WARN_TESTS})
+       string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} )
+       set(${F} ${THIS_FLAG})
+       set(V CXX_${F}_VALID)
+       message(STATUS "Checking for c++-compiler flag: ${THIS_FLAG}")
+       check_cxx_compiler_flag("${CXX_FLAG_TESTS} ${${F}}" ${V})
+       if (${${V}})
+               set(ADDED_WARN_CXX_FLAGS ${ADDED_WARN_CXX_FLAGS} ${${F}})
+       endif()
+endforeach()
+set(WS_WARNINGS_CXX_FLAGS ${ADDED_WARN_CXX_FLAGS})
+
+if(ENABLE_ASAN)
+       set(CMAKE_REQUIRED_LIBRARIES "-fsanitize=address")
+       check_c_compiler_flag(-fsanitize=address C__fsanitize_address_VALID)
+       check_cxx_compiler_flag(-fsanitize=address CXX__fsanitize_address_VALID)
+       set(CMAKE_REQUIRED_LIBRARIES "")
+       if(NOT C__fsanitize_address_VALID OR NOT CXX__fsanitize_address_VALID)
+               message(FATAL_ERROR "ENABLE_ASAN was requested, but not supported!")
+       endif()
+       set(CMAKE_C_FLAGS "-fsanitize=address ${CMAKE_C_FLAGS}")
+       set(CMAKE_CXX_FLAGS "-fsanitize=address ${CMAKE_CXX_FLAGS}")
+       # Disable ASAN for build-time tools, e.g. lemon
+       check_c_compiler_flag(-fno-sanitize=all C__fno_sanitize_all_VALID)
+       if(C__fno_sanitize_all_VALID)
+               set(NO_SANITIZE_CFLAGS "-fno-sanitize=all")
+               set(NO_SANITIZE_LDFLAGS "-fno-sanitize=all")
+       endif()
+endif()
+
+set(WERROR_COMMON_FLAGS "")
+set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "")
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
        if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
                set(WERROR_COMMON_FLAGS "/WX")
-               set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS)
        else()
                check_c_compiler_flag(-Werror WERROR)
                if (WERROR)
@@ -549,8 +613,6 @@ if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
                        set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "-Wno-error=deprecated-declarations")
                endif()
        endif()
-else()
-       set(WERROR_COMMON_FLAGS FALSE)
 endif()
 
 #
@@ -590,9 +652,14 @@ if( NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-       set (C_UNUSED "__attribute__((unused))" )
+       set (C_UNUSED       "__attribute__((unused))" )
+       set (WS_NORETURN    "__attribute__((noreturn))")
+elseif(MSVC)
+       set (C_UNUSED       "")
+       set (WS_NORETURN    "__declspec(noreturn)")
 else()
-       set (C_UNUSED "" )
+       set (C_UNUSED       "")
+       set (WS_NORETURN    "")
 endif()
 
 set(WIRESHARK_LD_FLAGS
@@ -646,7 +713,7 @@ set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH Pytho
 set(LEX_REQUIRED TRUE)
 set(GLIB2_REQUIRED TRUE)
 set(GLIB2_FIND_REQUIRED TRUE)
-set(GLIB2_MIN_VERSION 2.14.0)
+set(GLIB2_MIN_VERSION 2.22.0)
 set(GTHREAD2_REQUIRED TRUE)
 set(PythonInterp_FIND_VERSION 2)
 set(Python_ADDITIONAL_VERSIONS 3)
@@ -656,8 +723,6 @@ if (NOT WIN32)
        set(M_REQUIRED TRUE)
 endif()
 
-set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
-
 set(PACKAGELIST ${PACKAGELIST} LIBSSH)
 set(LIBSSH_OPTIONS "0.6")
 
@@ -742,11 +807,9 @@ if(ENABLE_PORTAUDIO AND BUILD_wireshark_gtk)
 endif()
 
 
-# Prefer c-ares over adns
-if(ENABLE_CARES) # C Asynchronouse resolver
+# C Asynchronous resolver
+if(ENABLE_CARES)
        set(PACKAGELIST ${PACKAGELIST} CARES)
-elseif(ENABLE_ADNS) # Gnu asynchronous DNS
-       set(PACKAGELIST ${PACKAGELIST} ADNS)
 endif()
 
 # Zlib compression
@@ -816,8 +879,6 @@ foreach(PACKAGE ${PACKAGELIST})
                set(PACKAGE_VAR "PYTHONINTERP")
        elseif(${PACKAGE} STREQUAL "Gettext")
                set(PACKAGE_VAR "GETTEXT")
-       elseif(${PACKAGE} STREQUAL "HtmlViewer")
-               set(PACKAGE_VAR "HTML_VIEWER")
        elseif(${PACKAGE} STREQUAL "Perl")
                set(PACKAGE_VAR "PERL")
        else()
@@ -882,13 +943,9 @@ endif()
 if(HAVE_LIBCARES)
        set(HAVE_C_ARES 1)
 endif()
-if(HAVE_LIBADNS)
-       set(HAVE_GNU_ADNS 1)
-endif()
-if(NOT HAVE_LIBCARES AND NOT HAVE_LIBADNS)
-       # We should make this an error at some point.
-       message(WARNING "Not using c-ares or ADNS.")
-       message(WARNING "Synchronous name resolution can seriously degrade performance.")
+if(NOT HAVE_LIBCARES)
+       message(WARNING "Not using c-ares.")
+       message(WARNING "DNS name resolution for captures will be disabled.")
 endif()
 if(HAVE_LIBNL AND HAVE_AIRPCAP)
        message(ERROR "Airpcap and Libnl support are mutually exclusive")
@@ -908,9 +965,9 @@ endif()
 if(GTK2_FOUND OR GTK3_FOUND)
        set(GTK_FOUND ON)
 endif()
-# That's the name autofoo uses
+
 if(HAVE_LIBZLIB)
-       set(HAVE_LIBZ 1)
+       set(HAVE_ZLIB 1)
        # Always include the "true" zlib includes first. This works around a
        # bug in the Windows setup of GTK[23] which has a faulty zconf.h.
        include_directories(BEFORE ${ZLIB_INCLUDE_DIRS})
@@ -943,6 +1000,17 @@ if (Qt5Widgets_FOUND)
                #
                list(REMOVE_ITEM Qt5Widgets_EXECUTABLE_COMPILE_FLAGS "-fPIC")
        endif()
+       if (Qt5Widgets_VERSION VERSION_GREATER 5.6
+           AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang"))
+               # Qt 5.7 and later require C++ 11. If our minmimu required CMake version
+               # is ever >= 3.1 we can use CXX_STANDARD + CXX_STANDARD_REQUIRED.
+               message(STATUS "Checking for C++ 11 support (Required by Qt 5.7 and later)")
+               check_cxx_compiler_flag(-std=c++11 CXX__std_c__11_VALID)
+               if(NOT CXX__std_c__11_VALID)
+                       message(FATAL_ERROR "Qt ${Qt5Widgets_VERSION} requires C++ 11")
+               endif()
+               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+       endif()
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
        set (QT_FOUND ON)
        set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES})
@@ -966,7 +1034,8 @@ if (Qt5Widgets_FOUND)
                # set(QT_WINEXTRAS_LIB 1) # Not needed?
        endif()
        if(NOT DEFINED MOC_OPTIONS)
-               set(MOC_OPTIONS --no-notes)
+               # Squelch moc verbose "nothing to do" output
+               set(MOC_OPTIONS -nn)
        endif()
 # If Qt4: QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic
 elseif(QT_FOUND)
@@ -989,8 +1058,14 @@ elseif(QT_FOUND)
        endif()
 endif()
 
-message(STATUS "C-Flags: ${CMAKE_C_FLAGS}")
-message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS}")
+if(ENABLE_CHECKHF_CONFLICT)
+       set(ENABLE_CHECK_FILTER 1)
+endif()
+
+string(REPLACE ";" " " _warnings_c_flags "${WS_WARNINGS_C_FLAGS}")
+message(STATUS "C-Flags: ${CMAKE_C_FLAGS} ${_warnings_c_flags}")
+string(REPLACE ";" " " _warnings_cxx_flags "${WS_WARNINGS_CXX_FLAGS}")
+message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS} ${_warnings_cxx_flags}")
 message(STATUS "Warnings as errors: ${WERROR_COMMON_FLAGS}")
 
 if(APPLE)
@@ -1012,16 +1087,26 @@ test_big_endian(WORDS_BIGENDIAN)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-add_subdirectory( asn1 EXCLUDE_FROM_ALL )
+# The top level checkAPIs target, add before subdirectory calls so it's avaiable to all
+add_custom_target(checkAPI)
+set_target_properties(checkAPI
+       PROPERTIES
+               FOLDER "Auxiliary"
+               EXCLUDE_FROM_ALL True
+               EXCLUDE_FROM_DEFAULT_BUILD True
+)
+
 add_subdirectory( capchild )
 add_subdirectory( caputils )
 add_subdirectory( codecs )
+add_subdirectory( doc )
 add_subdirectory( docbook )
 add_subdirectory( epan )
 add_subdirectory( randpkt_core )
 add_subdirectory( tools/lemon )
 add_subdirectory( ui )
 add_subdirectory( wiretap )
+add_subdirectory( writecap )
 add_subdirectory( wsutil )
 
 if(NOT WIN32)
@@ -1146,31 +1231,26 @@ gmx_test_large_files(GMX_LARGEFILES)
 add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
 
 if(WIN32)
-       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()
 
 if (${GIT_EXECUTABLE})
        set(GIT_BIN_PARAM "--git-bin ${GIT_EXECUTABLE}")
 endif()
 set( VERSION ${PROJECT_VERSION} )
-execute_process(
+add_custom_target(version
        COMMAND ${PERL_EXECUTABLE}
-               ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
-               --print-vcs ${GIT_BIN_PARAM}
-               ${CMAKE_CURRENT_SOURCE_DIR}
-       OUTPUT_VARIABLE VERSION_H_CONTENT
+               ${CMAKE_SOURCE_DIR}/make-version.pl
+               --set-vcs ${GIT_BIN_PARAM}
+               ${CMAKE_SOURCE_DIR}
 )
+set_target_properties(version PROPERTIES FOLDER "Auxiliary")
+
 set( configure_input "Built with CMake ${CMAKE_VERSION}" )
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
-configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_BINARY_DIR}/version.h)
-#set_target_properties(${CMAKE_BINARY_DIR}/version.h PROPERTIES FOLDER "Auxiliary")
 
 set( prefix "${CMAKE_INSTALL_PREFIX}" )
 set( exec_prefix "\${prefix}" )
@@ -1180,7 +1260,6 @@ set( plugindir "\${libdir}/wireshark/plugins/${CPACK_PACKAGE_VERSION}" )
 
 set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/")
 set( IN_FILES
-       adns_dll.rc
        capchild/doxygen.cfg.in
        caputils/doxygen.cfg.in
        doxygen.cfg.in
@@ -1211,6 +1290,7 @@ set( IN_FILES
        ui/gtk/doxygen.cfg.in
        ui/qt/doxygen.cfg.in
        wireshark.pc.in
+       writecap/doxygen.cfg.in
 )
 foreach( _in_file ${IN_FILES} )
        get_filename_component( _path ${_in_file} PATH )
@@ -1221,7 +1301,7 @@ endforeach()
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ])
 SET_FEATURE_INFO(SBC "SBC Codec for Bluetooth A2DP stream playing" "www: http://git.kernel.org/cgit/bluetooth/sbc.git" )
-SET_FEATURE_INFO(LIBSSH "libssh is library for ssh connections and it is needed to build sshdump" "www: https://www.libssh.org/get-it/" )
+SET_FEATURE_INFO(LIBSSH "libssh is library for ssh connections and it is needed to build sshdump/ciscodump" "www: https://www.libssh.org/get-it/" )
 
 FEATURE_SUMMARY(WHAT ALL)
 
@@ -1235,6 +1315,7 @@ link_directories(
        ${CMAKE_BINARY_DIR}/epan
        ${CMAKE_BINARY_DIR}/randpkt_core
        ${CMAKE_BINARY_DIR}/wiretap
+       ${CMAKE_BINARY_DIR}/writecap
        ${CMAKE_BINARY_DIR}/wsutil
 )
 
@@ -1254,6 +1335,7 @@ set(SHARK_COMMON_SRC
        cfile.c
        frame_tvbuff.c
        sync_pipe_write.c
+       ws_version_info.c
 )
 
 # sources for external capture interfaces
@@ -1262,6 +1344,7 @@ if(ENABLE_EXTCAP)
                ${SHARK_COMMON_SRC}
                extcap.c
                extcap_parser.c
+               extcap_spawn.c
        )
 endif()
 
@@ -1308,36 +1391,38 @@ set(INSTALL_DIRS
 )
 
 set(INSTALL_FILES
-       ${CMAKE_BINARY_DIR}/androiddump.html
-       ${CMAKE_BINARY_DIR}/sshdump.html
-       ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
-       ${CMAKE_BINARY_DIR}/capinfos.html
-       ${CMAKE_BINARY_DIR}/captype.html
        cfilters
        colorfilters
        dfilters
-       ${CMAKE_BINARY_DIR}/dftest.html
-       ${CMAKE_BINARY_DIR}/dumpcap.html
-       ${CMAKE_BINARY_DIR}/editcap.html
-       ${CMAKE_BINARY_DIR}/extcap.html
-       ${CMAKE_BINARY_DIR}/asn2deb.html
-       ${CMAKE_BINARY_DIR}/idl2deb.html
-       ${CMAKE_BINARY_DIR}/idl2wrs.html
        ipmap.html
        manuf
-       ${CMAKE_BINARY_DIR}/mergecap.html
        pdml2html.xsl
-       ${CMAKE_BINARY_DIR}/randpkt.html
-       ${CMAKE_BINARY_DIR}/randpktdump.html
-       ${CMAKE_BINARY_DIR}/rawshark.html
-       ${CMAKE_BINARY_DIR}/reordercap.html
        services
        smi_modules
-       ${CMAKE_BINARY_DIR}/text2pcap.html
-       ${CMAKE_BINARY_DIR}/tshark.html
-       ${CMAKE_BINARY_DIR}/wireshark-filter.html
-       ${CMAKE_BINARY_DIR}/wireshark.html
        docbook/ws.css
+       ${CMAKE_BINARY_DIR}/doc/AUTHORS-SHORT
+       ${CMAKE_BINARY_DIR}/doc/asn2deb.html
+       ${CMAKE_BINARY_DIR}/doc/androiddump.html
+       ${CMAKE_BINARY_DIR}/doc/udpdump.html
+       ${CMAKE_BINARY_DIR}/doc/capinfos.html
+       ${CMAKE_BINARY_DIR}/doc/captype.html
+       ${CMAKE_BINARY_DIR}/doc/ciscodump.html
+       ${CMAKE_BINARY_DIR}/doc/dftest.html
+       ${CMAKE_BINARY_DIR}/doc/dumpcap.html
+       ${CMAKE_BINARY_DIR}/doc/editcap.html
+       ${CMAKE_BINARY_DIR}/doc/extcap.html
+       ${CMAKE_BINARY_DIR}/doc/idl2deb.html
+       ${CMAKE_BINARY_DIR}/doc/idl2wrs.html
+       ${CMAKE_BINARY_DIR}/doc/mergecap.html
+       ${CMAKE_BINARY_DIR}/doc/randpkt.html
+       ${CMAKE_BINARY_DIR}/doc/randpktdump.html
+       ${CMAKE_BINARY_DIR}/doc/rawshark.html
+       ${CMAKE_BINARY_DIR}/doc/reordercap.html
+       ${CMAKE_BINARY_DIR}/doc/sshdump.html
+       ${CMAKE_BINARY_DIR}/doc/text2pcap.html
+       ${CMAKE_BINARY_DIR}/doc/tshark.html
+       ${CMAKE_BINARY_DIR}/doc/wireshark.html
+       ${CMAKE_BINARY_DIR}/doc/wireshark-filter.html
 )
 
 if(WIN32)
@@ -1349,40 +1434,13 @@ else()
        set(INSTALL_FILES COPYING ${INSTALL_FILES})
 endif()
 
-set(MAN1_FILES
-       ${CMAKE_BINARY_DIR}/androiddump.1
-       ${CMAKE_BINARY_DIR}/capinfos.1
-       ${CMAKE_BINARY_DIR}/captype.1
-       ${CMAKE_BINARY_DIR}/dftest.1
-       ${CMAKE_BINARY_DIR}/dumpcap.1
-       ${CMAKE_BINARY_DIR}/editcap.1
-       ${CMAKE_BINARY_DIR}/extcap.4
-       ${CMAKE_BINARY_DIR}/idl2wrs.1
-       ${CMAKE_BINARY_DIR}/mergecap.1
-       ${CMAKE_BINARY_DIR}/randpkt.1
-       ${CMAKE_BINARY_DIR}/androiddump.1
-       ${CMAKE_BINARY_DIR}/rawshark.1
-       ${CMAKE_BINARY_DIR}/reordercap.1
-       ${CMAKE_BINARY_DIR}/sshdump.1
-       ${CMAKE_BINARY_DIR}/text2pcap.1
-       ${CMAKE_BINARY_DIR}/tshark.1
-       ${CMAKE_BINARY_DIR}/wireshark.1
-)
-
-set(MAN4_FILES
-       ${CMAKE_BINARY_DIR}/wireshark-filter.4
-)
-
 set(LIBEPAN_LIBS
-#              @NSL_LIBS@      # -lnsl
-#              @SOCKET_LIBS@   # -lsocket
 #              @SSL_LIBS@      # -lcrypto
                epan
 #              $(plugin_ldadd) # in case of static
                ${AIRPCAP_LIBRARIES}
                ${PCAP_LIBRARIES}
                ${CARES_LIBRARIES}
-               ${ADNS_LIBRARIES}
                ${KERBEROS_LIBRARIES}
                ${LUA_LIBRARIES}
                ${PYTHON_LIBRARIES}
@@ -1427,20 +1485,6 @@ if(WIN32)
                )
        endforeach(_dll)
 
-
-       # Don't overwrite an exe if it's already there. We don't want to
-       # clobber any previous code signing.
-       file(GLOB _gspawn_helpers
-               RELATIVE "${GLIB2_DLL_DIR}"
-               "${GLIB2_DLL_DIR}/gspawn*.exe"
-       )
-       foreach(_gspawn_helper ${_gspawn_helpers})
-               add_custom_command(TARGET copy_cli_dlls PRE_BUILD
-                       COMMAND if not exist \"${_dll_output_dir_win}\\${_gspawn_helper}\" xcopy ${_gspawn_helper} "${_dll_output_dir_win}" /D /Y
-                       WORKING_DIRECTORY "${GLIB2_DLL_DIR}"
-               )
-       endforeach()
-
        # Optional
        if (AIRPCAP_FOUND)
                add_custom_command(TARGET copy_cli_dlls PRE_BUILD
@@ -1516,26 +1560,35 @@ if(WIN32)
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/mibs/iana"
+                               "${SMI_SHARE_DIR}/mibs/iana"
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/mibs/ietf"
+                               "${SMI_SHARE_DIR}/mibs/ietf"
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/mibs/irtf"
+                               "${SMI_SHARE_DIR}/mibs/irtf"
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/mibs/site"
+                               "${SMI_SHARE_DIR}/mibs/site"
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/mibs/tubs"
+                               "${SMI_SHARE_DIR}/mibs/tubs"
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/pibs"
+                               "${SMI_SHARE_DIR}/pibs"
                                "${_dll_output_dir}/snmp/mibs"
                        COMMAND ${CMAKE_COMMAND} -E copy_directory
-                               "${SMI_SHARE_DIR}/${SMI_DLL}/yang"
+                               "${SMI_SHARE_DIR}/yang"
                                "${_dll_output_dir}/snmp/mibs"
+                       #remove the extra directories copied (shallow copying the above would remove the need for this)
+                       COMMAND ${CMAKE_COMMAND} -E remove_directory
+                               "${_dll_output_dir}/snmp/mibs/iana"
+                       COMMAND ${CMAKE_COMMAND} -E remove_directory
+                               "${_dll_output_dir}/snmp/mibs/ietf"
+                       COMMAND ${CMAKE_COMMAND} -E remove_directory
+                               "${_dll_output_dir}/snmp/mibs/site"
+                       COMMAND ${CMAKE_COMMAND} -E remove_directory
+                               "${_dll_output_dir}/snmp/mibs/tubs"
                )
        endif(SMI_FOUND)
        if (WINSPARKLE_FOUND)
@@ -1607,7 +1660,7 @@ foreach(_install_file ${INSTALL_FILES})
                        "${_output_file}"
                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                DEPENDS
-                       html_docs
+                       docs
                        "${_install_file}"
        )
        list(APPEND copy_data_files_depends "${_output_file}")
@@ -1773,21 +1826,19 @@ if(ENABLE_APPLICATION_BUNDLE)
 
        # Wireshark.app/Contents/Resources
        set(BUNDLE_RESOURCE_FILES
-               ${CMAKE_SOURCE_DIR}/packaging/macosx/Resources/Wireshark.icns
-               ${CMAKE_SOURCE_DIR}/packaging/macosx/Resources/Wiresharkdoc.icns
+               ${CMAKE_SOURCE_DIR}/packaging/macosx/Wireshark.icns
+               ${CMAKE_SOURCE_DIR}/packaging/macosx/Wiresharkdoc.icns
        )
        set_source_files_properties(${BUNDLE_RESOURCE_FILES} PROPERTIES
                MACOSX_PACKAGE_LOCATION Resources
        )
 
        # Wireshark.app/Contents/Resources/share/man/man1
-       set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${MAN1_FILES})
        set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN1_FILES} PROPERTIES
                MACOSX_PACKAGE_LOCATION Resources/share/man/man1
        )
 
        # Wireshark.app/Contents/Resources/share/man/man1
-       set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${MAN4_FILES})
        set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN4_FILES} PROPERTIES
                MACOSX_PACKAGE_LOCATION Resources/share/man/man4
        )
@@ -1826,7 +1877,9 @@ if(BUILD_wireshark AND QT_FOUND)
        endif()
 
        add_executable(wireshark WIN32 MACOSX_BUNDLE wireshark-qt.cpp ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
+       add_dependencies(wireshark version)
        set(PROGLIST ${PROGLIST} wireshark)
+       set_target_properties(wireshark PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_CXX_FLAGS}")
        set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        set_target_properties(wireshark PROPERTIES FOLDER "Executables")
        if(ENABLE_APPLICATION_BUNDLE OR WIN32)
@@ -1842,7 +1895,8 @@ if(BUILD_wireshark AND QT_FOUND)
                # convenience but makes debugging more difficult.
                file(REMOVE ${CMAKE_BINARY_DIR}/run/wireshark)
                file(WRITE ${CMAKE_BINARY_DIR}/run/wireshark "#!/bin/sh\n")
-               file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "open ${CMAKE_BINARY_DIR}/run/Wireshark.app --args \"\$\@\"\n")
+               file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n")
+               file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "exec ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/MacOS/Wireshark \"\$\@\"\n")
                execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/wireshark)
        endif()
 
@@ -1904,6 +1958,7 @@ endif()
 # Common properties for CLI executables
 macro(set_extra_executable_properties _executable _folder)
        set_target_properties(${_executable} PROPERTIES
+               COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
                LINK_FLAGS "${WS_LINK_FLAGS}"
                FOLDER ${_folder}
        )
@@ -1931,6 +1986,7 @@ macro(set_extcap_executable_properties _executable)
 
        if(WIN32)
                set_target_properties(${_executable} PROPERTIES
+                       COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
                        LINK_FLAGS "${WS_LINK_FLAGS}"
                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/extcap
                        RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/run/Debug/extcap
@@ -1940,6 +1996,7 @@ macro(set_extcap_executable_properties _executable)
                )
        else()
                set_target_properties(${_executable} PROPERTIES
+                       COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
                        LINK_FLAGS "${WS_LINK_FLAGS}"
                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/extcap
                )
@@ -1979,7 +2036,9 @@ if(BUILD_wireshark_gtk AND GTK_FOUND)
        # wireshark and wireshark-gtk share wireshark_FILES
 
        add_executable(wireshark-gtk WIN32 ${wireshark_FILES})
+       add_dependencies(wireshark-gtk version)
        set(PROGLIST ${PROGLIST} wireshark-gtk)
+       set_target_properties(wireshark-gtk PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
        set_target_properties(wireshark-gtk PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        set_target_properties(wireshark-gtk PROPERTIES FOLDER "Executables")
        target_link_libraries(wireshark-gtk ${wireshark_gtk_LIBS})
@@ -2090,6 +2149,7 @@ if(BUILD_tshark)
                ${CMAKE_BINARY_DIR}/image/tshark.rc
        )
        add_executable(tshark ${tshark_FILES})
+       add_dependencies(tshark version)
        set_extra_executable_properties(tshark "Executables")
        target_link_libraries(tshark ${tshark_LIBS})
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2109,6 +2169,7 @@ if(BUILD_tfshark)
                ${CMAKE_BINARY_DIR}/image/tfshark.rc
        )
        add_executable(tfshark ${tfshark_FILES})
+       add_dependencies(tfshark version)
        set_extra_executable_properties(tfshark "Executables")
        target_link_libraries(tfshark ${tfshark_LIBS})
        install(TARGETS tfshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2128,6 +2189,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
                ${CMAKE_BINARY_DIR}/image/rawshark.rc
        )
        add_executable(rawshark ${rawshark_FILES})
+       add_dependencies(rawshark version)
        set_extra_executable_properties(rawshark "Executables")
        target_link_libraries(rawshark ${rawshark_LIBS})
        install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2142,6 +2204,7 @@ if(BUILD_dftest)
                ui/util.c
        )
        add_executable(dftest ${dftest_FILES})
+       add_dependencies(dftest version)
        set_extra_executable_properties(dftest "Tests")
        target_link_libraries(dftest ${dftest_LIBS})
        install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2154,16 +2217,15 @@ if(BUILD_randpkt)
                wsutil
                ${M_LIBRARIES}
                ${PCAP_LIBRARIES}
-#              @SOCKET_LIBS@
-#              @NSL_LIBS@
                ${CARES_LIBRARIES}
-               ${ADNS_LIBRARIES}
                ${ZLIB_LIBRARIES}
        )
        set(randpkt_FILES
                randpkt.c
+               ws_version_info.c
        )
        add_executable(randpkt ${randpkt_FILES})
+       add_dependencies(randpkt version)
        set_extra_executable_properties(randpkt "Executables")
        target_link_libraries(randpkt ${randpkt_LIBS})
        install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2171,22 +2233,24 @@ endif()
 
 if(BUILD_text2pcap)
        set(text2pcap_LIBS
+               writecap
                wsutil
                ${M_LIBRARIES}
                ${ZLIB_LIBRARIES}
        )
        set(text2pcap_CLEAN_FILES
                text2pcap.c
-               pcapio.c
+               ws_version_info.c
        )
        set(text2pcap_FILES
                ${text2pcap_CLEAN_FILES}
                ${CMAKE_BINARY_DIR}/image/text2pcap.rc
        )
-       add_lex_files(text2pcap_FILES
+       add_lex_files(text2pcap_LEX_FILES text2pcap_GENERATED_FILES
                text2pcap-scanner.l
        )
-       add_executable(text2pcap ${text2pcap_FILES})
+       add_executable(text2pcap ${text2pcap_FILES} ${text2pcap_GENERATED_FILES})
+       add_dependencies(text2pcap version)
        set_extra_executable_properties(text2pcap "Executables")
        target_link_libraries(text2pcap ${text2pcap_LIBS})
        install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2200,9 +2264,11 @@ if(BUILD_mergecap)
        )
        set(mergecap_FILES
                mergecap.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/mergecap.rc
        )
        add_executable(mergecap ${mergecap_FILES})
+       add_dependencies(mergecap version)
        set_extra_executable_properties(mergecap "Executables")
        target_link_libraries(mergecap ${mergecap_LIBS})
        install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2216,9 +2282,11 @@ if(BUILD_reordercap)
        )
        set(reordercap_FILES
                reordercap.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/reordercap.rc
        )
        add_executable(reordercap ${reordercap_FILES})
+       add_dependencies(reordercap version)
        set_extra_executable_properties(reordercap "Executables")
        target_link_libraries(reordercap ${reordercap_LIBS})
        install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2234,9 +2302,11 @@ if(BUILD_capinfos)
        )
        set(capinfos_FILES
                capinfos.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/capinfos.rc
        )
        add_executable(capinfos ${capinfos_FILES})
+       add_dependencies(capinfos version)
        set_extra_executable_properties(capinfos "Executables")
        target_link_libraries(capinfos ${capinfos_LIBS})
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2251,9 +2321,11 @@ if(BUILD_captype)
        )
        set(captype_FILES
                captype.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/captype.rc
        )
        add_executable(captype ${captype_FILES})
+       add_dependencies(captype version)
        set_extra_executable_properties(captype "Executables")
        target_link_libraries(captype ${captype_LIBS})
        install(TARGETS captype RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2267,9 +2339,11 @@ if(BUILD_editcap)
        )
        set(editcap_FILES
                editcap.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/editcap.rc
        )
        add_executable(editcap ${editcap_FILES})
+       add_dependencies(editcap version)
        set_extra_executable_properties(editcap "Executables")
        target_link_libraries(editcap ${editcap_LIBS})
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -2277,12 +2351,11 @@ endif()
 
 if(BUILD_dumpcap AND PCAP_FOUND)
        set(dumpcap_LIBS
+               writecap
                wsutil
                caputils
                ${PCAP_LIBRARIES}
                ${CAP_LIBRARIES}
-#              @SOCKET_LIBS@
-#              @NSL_LIBS@
                ${GLIB2_LIBRARIES}
                ${GTHREAD2_LIBRARIES}
                ${ZLIB_LIBRARIES}
@@ -2296,12 +2369,13 @@ if(BUILD_dumpcap AND PCAP_FOUND)
                conditions.c
                dumpcap.c
                filter_files.c
-               pcapio.c
                ringbuffer.c
                sync_pipe_write.c
+               ws_version_info.c
                ${CMAKE_BINARY_DIR}/image/dumpcap.rc
        )
        add_executable(dumpcap ${dumpcap_FILES})
+       add_dependencies(dumpcap version)
        set_extra_executable_properties(dumpcap "Executables")
        target_link_libraries(dumpcap ${dumpcap_LIBS})
        install(TARGETS dumpcap
@@ -2338,6 +2412,13 @@ if (WIN32)
                ADD_NSIS_PACKAGE_TARGET()
        endif()
 
+       find_package( WiX )
+
+       if (NOT "${WIX_CANDLE_EXECUTABLE}" STREQUAL "WIX_CANDLE_EXECUTABLE-NOTFOUND")
+               add_subdirectory( packaging/wix EXCLUDE_FROM_ALL )
+               ADD_WIX_PACKAGE_TARGET()
+       endif()
+
        find_package( PortableApps )
        if (
                NOT "${PORTABLEAPPS_LAUNCHER_GENERATOR_EXECUTABLE}" STREQUAL "PORTABLEAPPS_LAUNCHER_GENERATOR_EXECUTABLE-NOTFOUND"
@@ -2349,7 +2430,7 @@ if (WIN32)
        endif()
 endif()
 
-if(BUILD_androiddump)
+if(ENABLE_EXTCAP AND BUILD_androiddump)
        if(EXTCAP_ANDROIDDUMP_LIBPCAP)
                if(HAVE_LIBPCAP)
                        set(androiddump_LIBS
@@ -2368,6 +2449,7 @@ if(BUILD_androiddump)
        endif()
        set(androiddump_FILES
                extcap/androiddump.c
+               extcap/extcap-base.c
        )
 
        add_executable(androiddump WIN32 ${androiddump_FILES})
@@ -2377,17 +2459,20 @@ if(BUILD_androiddump)
        install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR})
 endif()
 
-if(BUILD_sshdump AND LIBSSH_FOUND)
+if(ENABLE_EXTCAP AND BUILD_sshdump AND LIBSSH_FOUND)
        set(sshdump_LIBS
+               wsutil
                ${GLIB2_LIBRARIES}
                ${CMAKE_DL_LIBS}
                ${LIBSSH_LIBRARIES}
        )
        if (WIN32)
-               set(sshdump_LIBS wsutil ${sshdump_LIBS})
+               set(sshdump_LIBS wsutil ${sshdump_LIBS})
        endif()
        set(sshdump_FILES
                extcap/sshdump.c
+               extcap/extcap-base.c
+               extcap/ssh-base.c
        )
 
        add_executable(sshdump WIN32 ${sshdump_FILES})
@@ -2399,7 +2484,51 @@ elseif (BUILD_sshdump)
        #message( WARNING "Cannot find libssh, cannot build sshdump" )
 endif()
 
-if(BUILD_randpktdump)
+if(ENABLE_EXTCAP AND BUILD_ciscodump AND LIBSSH_FOUND)
+       set(ciscodump_LIBS
+               writecap
+               wsutil
+               ${GLIB2_LIBRARIES}
+               ${CMAKE_DL_LIBS}
+               ${LIBSSH_LIBRARIES}
+       )
+       if (WIN32)
+               set(ciscodump_LIBS wsutil ${ciscodump_LIBS})
+       endif()
+       set(ciscodump_FILES
+               extcap/ciscodump.c
+               extcap/extcap-base.c
+               extcap/ssh-base.c
+       )
+
+       add_executable(ciscodump WIN32 ${ciscodump_FILES})
+       set_extcap_executable_properties(ciscodump)
+       target_link_libraries(ciscodump ${ciscodump_LIBS})
+       target_include_directories(ciscodump PUBLIC ${LIBSSH_INCLUDE_DIR})
+       install(TARGETS ciscodump RUNTIME DESTINATION ${EXTCAP_DIR})
+elseif (BUILD_ciscodump)
+       #message( WARNING "Cannot find libssh, cannot build ciscodump" )
+endif()
+
+if(ENABLE_EXTCAP AND BUILD_udpdump)
+       set(udpdump_LIBS
+               ${GLIB2_LIBRARIES}
+               ${CMAKE_DL_LIBS}
+               ${LIBEPAN_LIBS}
+               writecap
+       )
+       set(udpdump_FILES
+               extcap/udpdump.c
+               extcap/extcap-base.c
+       )
+
+       add_executable(udpdump WIN32 ${udpdump_FILES})
+       set_extcap_executable_properties(udpdump)
+       target_link_libraries(udpdump ${udpdump_LIBS})
+       install(TARGETS udpdump RUNTIME DESTINATION ${EXTCAP_DIR})
+endif()
+
+if(ENABLE_EXTCAP AND BUILD_randpktdump)
        set(randpktdump_LIBS
                randpkt_core
                wiretap
@@ -2407,6 +2536,7 @@ if(BUILD_randpktdump)
                ${CMAKE_DL_LIBS}
        )
        set(randpktdump_FILES
+               extcap/extcap-base.c
                extcap/randpktdump.c
        )
 
@@ -2417,57 +2547,6 @@ if(BUILD_randpktdump)
        install(TARGETS randpktdump RUNTIME DESTINATION ${EXTCAP_DIR})
 endif()
 
-ADD_CUSTOM_COMMAND(
-       OUTPUT  ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
-       COMMAND ${PERL_EXECUTABLE}
-               ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
-               ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
-               < ${CMAKE_SOURCE_DIR}/AUTHORS
-               > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
-       DEPENDS
-               ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
-               ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
-               ${CMAKE_SOURCE_DIR}/AUTHORS
-)
-
-ADD_CUSTOM_COMMAND(
-       OUTPUT  ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
-       COMMAND ${PERL_EXECUTABLE}
-               ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
-               ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
-               < ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
-               > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
-       DEPENDS
-               ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
-               ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
-               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
-)
-
-if(WIN32)
-FILE(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template WPT_WIN_PATH)
-FILE(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT ASF_WIN_PATH)
-FILE(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/wireshark.pod WP_WIN_PATH)
-ADD_CUSTOM_COMMAND(
-       OUTPUT  ${CMAKE_BINARY_DIR}/wireshark.pod
-       COMMAND copy /B ${WPT_WIN_PATH} + ${ASF_WIN_PATH} ${WP_WIN_PATH}
-       DEPENDS
-               ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
-               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
-)
-else()
-
-ADD_CUSTOM_COMMAND(
-       OUTPUT  ${CMAKE_BINARY_DIR}/wireshark.pod
-       COMMAND cat
-               ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
-               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
-               > ${CMAKE_BINARY_DIR}/wireshark.pod
-       DEPENDS
-               ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
-               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
-)
-endif()
-
 if(ENABLE_APPLICATION_BUNDLE)
        add_custom_target(app_bundle)
        set_target_properties(app_bundle PROPERTIES FOLDER "Copy Tasks")
@@ -2524,53 +2603,6 @@ if(ENABLE_APPLICATION_BUNDLE)
 
 endif()
 
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/androiddump 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/capinfos 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/captype 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dftest 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dumpcap 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/editcap 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/extcap 4 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/asn2deb 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2deb 1 )
-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/randpktdump 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/rawshark 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/reordercap 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/sshdump 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
-pod2manhtml( ${CMAKE_BINARY_DIR}/wireshark 1 )
-pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/wireshark-filter 4 )
-
-add_custom_target(
-       html_docs ALL
-       DEPENDS
-               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
-               androiddump.html
-               capinfos.html
-               captype.html
-               dftest.html
-               dumpcap.html
-               editcap.html
-               asn2deb.html
-               idl2deb.html
-               idl2wrs.html
-               mergecap.html
-               randpkt.html
-               randpktdump.html
-               rawshark.html
-               reordercap.html
-               sshdump.html
-               text2pcap.html
-               tshark.html
-               wireshark.html
-               wireshark-filter.html
-)
-set_target_properties(html_docs PROPERTIES FOLDER "Docs")
-
 set(CLEAN_FILES
        ${wireshark_FILES}
        ${tshark_FILES}
@@ -2578,6 +2610,7 @@ set(CLEAN_FILES
        ${dftest_FILES}
        ${randpkt_FILES}
        ${randpktdump_FILES}
+       ${udpdump_FILES}
        ${text2pcap_CLEAN_FILES}
        ${mergecap_FILES}
        ${capinfos_FILES}
@@ -2586,15 +2619,15 @@ set(CLEAN_FILES
        ${dumpcap_FILES}
        ${androiddump_FILES}
        ${sshdump_FILES}
+       ${ciscodump_FILES}
+       ${udpdump_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 install(
        FILES
@@ -2603,20 +2636,6 @@ install(
                ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}
 )
 
-install(
-       FILES
-               ${MAN1_FILES}
-       DESTINATION
-               ${CMAKE_INSTALL_MANDIR}/man1
-)
-
-install(
-       FILES
-               ${MAN4_FILES}
-       DESTINATION
-               ${CMAKE_INSTALL_MANDIR}/man4
-)
-
 install(
        FILES
                "${CMAKE_BINARY_DIR}/wireshark.pc"
@@ -2639,12 +2658,6 @@ install(
        PATTERN "faq.py" EXCLUDE
 )
 
-include( UseCheckAPI )
-CHECKAPI(
-       ${TSHARK_TAP_SRC}
-       ${WIRESHARK_SRC}
-)
-
 set(CMAKE_INSTALL_MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME})
 configure_file("${CMAKE_MODULE_PATH}/WiresharkConfig.cmake.in" "${CMAKE_BINARY_DIR}/WiresharkConfig.cmake" @ONLY)
 configure_file("${CMAKE_MODULE_PATH}/WiresharkConfigVersion.cmake.in" "${CMAKE_BINARY_DIR}/WiresharkConfigVersion.cmake" @ONLY)
@@ -2695,6 +2708,18 @@ add_custom_target(test-sh
 )
 set_target_properties(test-sh PROPERTIES FOLDER "Tests")
 
+if (GIT_EXECUTABLE)
+       # Update AUTHORS file with entries from git shortlog
+       add_custom_target(
+               gen-authors
+               COMMAND ${PERL_EXECUTABLE} tools/generate_authors.pl AUTHORS.src > AUTHORS
+               WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+       )
+else (GIT_EXECUTABLE)
+       add_custom_target( gen-authors COMMAND ${CMAKE_COMMAND} -E echo "Git not found." )
+endif (GIT_EXECUTABLE)
+set_target_properties(gen-authors PROPERTIES FOLDER "Docs")
+
 add_custom_target(test-programs
        DEPENDS test-sh
                exntest
@@ -2734,6 +2759,36 @@ else ()
        endif()
 endif()
 
+include( UseCheckAPI )
+CHECKAPI(
+       NAME
+         main
+       SWITCHES
+         -build
+       SOURCES
+         ${WIRESHARK_SRC}
+         ${TSHARK_TAP_SRC}
+)
+
+find_program(SHELLCHECK_EXECUTABLE shellcheck
+       DOC "Path to the shellcheck utility."
+)
+if (NOT "${SHELLCHECK_EXECUTABLE}" STREQUAL "SHELLCHECK_EXECUTABLE-NOTFOUND")
+       add_custom_target(shellcheck)
+       set_target_properties(shellcheck PROPERTIES FOLDER "Tests")
+       # --external-sources requires 0.4.0 or later.
+       add_custom_command(TARGET shellcheck POST_BUILD
+               COMMAND shellcheck --external-sources
+                       tools/fuzz-test.sh
+                       tools/randpkt-test.sh
+                       tools/runa2x.sh
+                       tools/test-captures.sh
+                       tools/valgrind-wireshark.sh
+               WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+       )
+endif()
+
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #