sq epan/dissectors/packet-smb2.c no check_col => fsctl_pipe_wait
[metze/wireshark/wip.git] / CMakeLists.txt
index afbcbf2efd1603e8f8a5edd1833fd1e6c8835865..f6dc55cb89586fbbbd621c5731a7c1d53713d189 100644 (file)
@@ -35,18 +35,17 @@ cmake_policy(SET CMP0011 OLD)
 # Policy since 2.8.1
 #cmake_policy(SET CMP0015 NEW)
 # Policy since 2.8.11
-if( ${CMAKE_MAJOR_VERSION} GREATER 2 OR
-    ${CMAKE_MINOR_VERSION} GREATER 8 OR
-    (${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 10) )
+if( ${CMAKE_MAJOR_VERSION} GREATER 2 OR ${CMAKE_MINOR_VERSION} GREATER 8 OR
+       (${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 10) )
        # Don't: Automatically link Qt executable to qtmain target on Windows
        cmake_policy(SET CMP0020 OLD)
 endif()
 
 # This cannot be implemented via option(...)
 if( NOT CMAKE_BUILD_TYPE )
-  set( CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-      FORCE)
+       set( CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+               "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+               FORCE)
 endif()
 message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}")
 message(STATUS "${CMAKE_BUILD_TYPE}: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
@@ -102,10 +101,10 @@ message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PRO
 
 #Where to find local cmake scripts
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-INCLUDE(UseLemon)
-INCLUDE(UseMakeDissectorReg)
-INCLUDE(UseMakeTapReg)
-INCLUDE(UseAsn2Wrs)
+include(UseLemon)
+include(UseMakeDissectorReg)
+include(UseMakeTapReg)
+include(UseAsn2Wrs)
 
 # Under linux the release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG
 
@@ -119,135 +118,179 @@ include_directories(
        ${CMAKE_BINARY_DIR}
        ${CMAKE_SOURCE_DIR}
        ${CMAKE_SOURCE_DIR}/epan
+       ${CMAKE_SOURCE_DIR}/filetap
        ${CMAKE_SOURCE_DIR}/tools/lemon
        ${CMAKE_SOURCE_DIR}/wiretap
 )
 
-#Where to put libraries
+#Where to put executables and libraries in the build tree
+if(NOT ARCHIVE_OUTPUT_PATH)
+       set(ARCHIVE_OUTPUT_PATH ${Wireshark_BINARY_DIR}/run CACHE INTERNAL
+                  "Single output directory for building all archives.")
+endif()
+if(NOT EXECUTABLE_OUTPUT_PATH)
+       set(EXECUTABLE_OUTPUT_PATH ${Wireshark_BINARY_DIR}/run CACHE INTERNAL
+                  "Single output directory for building all executables.")
+endif()
 if(NOT LIBRARY_OUTPUT_PATH)
-       set(LIBRARY_OUTPUT_PATH ${Wireshark_BINARY_DIR}/lib CACHE INTERNAL
+       set(LIBRARY_OUTPUT_PATH ${Wireshark_BINARY_DIR}/run CACHE INTERNAL
                   "Single output directory for building all libraries.")
 endif()
 
-
-include(CMakeOptions.txt)
+include( CMakeOptions.txt )
+if( DUMPCAP_INSTALL_OPTION STREQUAL "suid" )
+       set( DUMPCAP_SETUID "SETUID" )
+else()
+       set( DUMPCAP_SETUID )
+endif()
+if( NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+       DUMPCAP_INSTALL_OPTION STREQUAL "capabilities" )
+       message( WARNING "Capabilities are only supported on Linux" )
+       set( DUMPCAP_INSTALL_OPTION )
+endif()
 
 if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
-    set(LOCAL_CFLAGS
-        /Zi
-        /W3
-        /MDd
-        /DWIN32_LEAN_AND_MEAN
-        "/DMSC_VER_REQUIRED=${MSC_VER_REQUIRED}"
-        /D_CRT_SECURE_NO_DEPRECATE
-        /D_CRT_NONSTDC_NO_DEPRECATE
-        /MP
-       # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
-       # This avoids conflicts with the C++ standard library.
-       /DNOMINMAX
-    )
-
-    if(NOT WIN64)
-        set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/D_BIND_TO_CURRENT_CRT_VERSION=1")
-    endif()
-
-    # Additional compiler warnings to be treated as "Level 3"
-    #  when compiling Wireshark sources. (Selected from "level 4" warnings).
-    ## 4295: array is too small to include a terminating null character
-    set(WARNINGS_CFLAGS "/w34295")
-
-    set(WIRESHARK_C_FLAGS
-       # FIXME: This doen't work as PCAP_VERSION will be determined later
-        "/DPCAP_VERSION=${PCAP_VERSION}"
-        ${LOCAL_CFLAGS}
-        ${WARNINGS_CFLAGS}
-    )
+       if (MSVC10)
+               set(MSC_VER_REQUIRED 1600)
+       elseif(MSVC11)
+               set(MSC_VER_REQUIRED 1700)
+       elseif(MSVC12)
+               set(MSC_VER_REQUIRED 1800)
+       else()
+               message(FATAL_ERROR "You are using an unsupported version of MSVC")
+       endif()
+       set(LOCAL_CFLAGS
+               /Zi
+               /W3
+               /MDd
+               /DWIN32_LEAN_AND_MEAN
+               "/DMSC_VER_REQUIRED=${MSC_VER_REQUIRED}"
+               /D_CRT_SECURE_NO_DEPRECATE
+               /D_CRT_NONSTDC_NO_DEPRECATE
+               /MP
+               # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
+               # This avoids conflicts with the C++ standard library.
+               /DNOMINMAX
+       )
+
+       if(NOT WIN64)
+               set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/D_BIND_TO_CURRENT_CRT_VERSION=1")
+       endif()
+
+       # Additional compiler warnings to be treated as "Level 3"
+       #  when compiling Wireshark sources. (Selected from "level 4" warnings).
+       ## 4295: array is too small to include a terminating null character
+       set(WARNINGS_CFLAGS "/w34295")
+
+       # FIXME: WINPCAP_VERSION cannot be determined from source or executable.
+       set(WINPCAP_VERSION "unknown")
+       set(WIRESHARK_C_FLAGS
+               "/DWINPCAP_VERSION=${WINPCAP_VERSION}"
+               ${LOCAL_CFLAGS}
+               ${WARNINGS_CFLAGS}
+       )
 else()
-    set(WIRESHARK_C_FLAGS
-       # -O<X> and -g get set by the CMAKE_BUILD_TYPE
-        -Wall
-        -W
-        -Wextra
-        -Wendif-labels
-        -Wpointer-arith
-        -Warray-bounds
-        -Wformat-security
-        -Wshorten-64-to-32
-        -Wvla
-        -Waddress
-        -Warray-bounds
-        -Wattributes
-        -Wdiv-by-zero
-        -Wignored-qualifiers
-        -Wno-overlength-strings
-        -Wwrite-strings
-        -Wno-long-long
-        -Wpragmas
-    )
-
-    set(WIRESHARK_C_ONLY_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
-    )
-
-    set(WIRESHARK_EXTRA_C_FLAGS
-        -pedantic
-        -Woverflow
-        -fstrict-overflow -Wstrict-overflow=4
-        -Wunreachable-code
-        -Wunsafe-loop-optimizations
-        -Wcast-align
-        -Wcast-qual
-        -Wformat-security
-        -Wredundant-decls
-        # All the registration functions block these for now.
-        -Wmissing-declarations
-    )
-
-    set(WIRESHARK_EXTRA_C_ONLY_FLAGS
-        # The following are C only, not C++
-        -Wbad-function-cast
-        # All the registration functions block these for now.
-        -Wmissing-prototypes
-    )
-
-    # With clang some tests don't fail properly during testing but only
-    # during real compiles
-
-    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-        set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
-            -Qunused-arguments
-            #-fcolor-diagnostics
-        )
-    else()
-        set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
-            -fexcess-precision=fast
-        )
-
-        set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS}
-        )
-    endif()
-
-    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(
-        -DG_DISABLE_DEPRECATED
-        -DG_DISABLE_SINGLE_INCLUDES
-    )
+       set(WIRESHARK_C_FLAGS
+               # -O<X> and -g get set by the CMAKE_BUILD_TYPE
+               -Wall
+               -W
+               -Wextra
+               -Wendif-labels
+               -Wpointer-arith
+               -Warray-bounds
+               -Wformat-security
+               -Wvla
+               -Waddress
+               -Wattributes
+               -Wdiv-by-zero
+               -Wignored-qualifiers
+               -Wno-overlength-strings
+               -Wwrite-strings
+               -Wno-long-long
+               -Wpragmas
+       )
+
+       set(WIRESHARK_C_ONLY_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
+               # 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_CPP_ONLY_FLAGS
+       )
+
+       set(WIRESHARK_EXTRA_C_FLAGS
+               -pedantic
+               -Woverflow
+               -fstrict-overflow -Wstrict-overflow=4
+               -Wunreachable-code
+               -Wunsafe-loop-optimizations
+               -Wcast-align
+               -Wcast-qual
+               -Wformat-security
+               -Wredundant-decls
+               -Wheader-guard
+               -fwrapv
+               -fno-strict-overflow
+               -fno-delete-null-pointer-checks
+               # All the registration functions block these for now.
+               -Wmissing-declarations
+       )
+
+       set(WIRESHARK_EXTRA_C_ONLY_FLAGS
+               # The following are C only, not C++
+               -Wbad-function-cast
+               # All the registration functions block these for now.
+               -Wmissing-prototypes
+       )
+
+       set(WIRESHARK_EXTRA_CPP_ONLY_FLAGS
+       )
+
+       # With clang some tests don't fail properly during testing but only
+       # during real compiles
+
+       if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+               set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
+                       -Qunused-arguments
+                       #-fcolor-diagnostics
+       )
+       else()
+               set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
+                       -fexcess-precision=fast
+               )
+
+               set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS}
+               )
+       endif()
+
+       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})
+               set(WIRESHARK_CPP_ONLY_FLAGS ${WIRESHARK_CPP_ONLY_FLAGS} ${WIRESHARK_EXTRA_CPP_ONLY_FLAGS})
+       endif()
+
+       add_definitions(
+               -DG_DISABLE_DEPRECATED
+               -DG_DISABLE_SINGLE_INCLUDES
+       )
 endif()
 
+set( C_FLAG_TESTS ${WIRESHARK_C_FLAGS} ${WIRESHARK_C_ONLY_FLAGS} )
+set( CPP_FLAG_TESTS ${WIRESHARK_C_FLAGS} ${WIRESHARK_CPP_ONLY_FLAGS} )
+
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
 include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
 
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
        check_c_compiler_flag(-Werror=unknown-warning-option WERR_UNKNOWN)
@@ -261,36 +304,31 @@ if(WERR_UNKNOWN)
        set(CMAKE_REQUIRED_FLAGS -Werror=unknown-warning-option )
 endif()
 
-set(C 0)
 # Sigh: Have to use THIS_FLAG instead of ${F} for some reason
-foreach(THIS_FLAG ${WIRESHARK_C_FLAGS})
-       set(F WS_C_FLAG_${C})
+foreach(THIS_FLAG ${C_FLAG_TESTS})
+       string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} )
        set(${F} ${THIS_FLAG})
-       set(V WS_C_FLAG_VALID${C})
-       message(STATUS "Checking for flag: ${${F}}")
+       set(V C_${F}_VALID)
+       message(STATUS "Checking for c-compiler flag: ${THIS_FLAG}")
        check_c_compiler_flag(${${F}} ${V})
        if (${${V}})
                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})
+foreach(THIS_FLAG ${CPP_FLAG_TESTS})
+       string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} )
        set(${F} ${THIS_FLAG})
-       set(V WS_C_FLAG_VALID${C})
-       message(STATUS "Checking for flag: ${${F}}")
-       check_c_compiler_flag(${${F}} ${V})
+       set(V CPP_${F}_VALID)
+       message(STATUS "Checking for c++-compiler flag: ${THIS_FLAG}")
+       check_cxx_compiler_flag(${${F}} ${V})
        if (${${V}})
-               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
+               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${F}}")
        endif()
-       math(EXPR C "${C} + 1")
 endforeach()
 message(STATUS "C-Flags: ${CMAKE_C_FLAGS}\nCXX-Flags: ${CMAKE_CXX_FLAGS}")
 
 check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
-if((FVHIDDEN))
+if(FVHIDDEN)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
 else() # TODO add alternate compiler flags for hiding symbols
        message(WARNING "Hiding shared library symbols is not supported by the compiler."
@@ -397,7 +435,8 @@ if(BUILD_qtshark)
                # somewhere. The if WIN32 in this place is annoying as well.
                if( WIN32 )
                        set( QT5_BASE_PATH "$ENV{QT5_BASE_DIR}" )
-                       set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}\\msvc2010" )
+                       set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}" )
+                       # Used for the creation of setpath.bat
                        set( QT5_DLL_PATH "${CMAKE_PREFIX_PATH}/bin/dummy" )
                        set( WS_ALL_LIBS ${WS_ALL_LIBS} ${QT5_DLL_PATH} )
                endif()
@@ -435,9 +474,9 @@ endif()
 
 
 # Prefer c-ares over adns
-if(ENABLE_CARES)        # C Asynchronouse resolver
+if(ENABLE_CARES) # C Asynchronouse resolver
        set(PACKAGELIST ${PACKAGELIST} CARES)
-elseif(ENABLE_ADNS)     # Gnu asynchronous DNS
+elseif(ENABLE_ADNS) # Gnu asynchronous DNS
        set(PACKAGELIST ${PACKAGELIST} ADNS)
 endif()
 
@@ -462,7 +501,7 @@ endif()
 
 # Capabilities
 if(ENABLE_CAP)
-       set(PACKAGELIST ${PACKAGELIST} CAP)
+       set(PACKAGELIST ${PACKAGELIST} CAP SETCAP)
 endif()
 
 if(ENABLE_PYTHON)
@@ -473,7 +512,11 @@ set(PACKAGELIST ${PACKAGELIST} YAPP)
 
 set(PACKAGELIST ${PACKAGELIST} POD)
 
-set(PROGLIST text2pcap mergecap capinfos editcap reordercap dumpcap)
+if(ENABLE_GUIDES)
+       set(PACKAGELIST ${PACKAGELIST} DOXYGEN)
+endif()
+
+set(PROGLIST text2pcap mergecap capinfos captype editcap reordercap dumpcap)
 
 #Sort the package list
 list(SORT PACKAGELIST)
@@ -554,6 +597,9 @@ endif()
 # That's the name autofoo uses
 if(HAVE_LIBZLIB)
        set(HAVE_LIBZ 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})
 endif()
 if (Qt5Widgets_FOUND)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
@@ -582,13 +628,12 @@ test_big_endian(WORDS_BIGENDIAN)
 
 set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}")
 
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 if(ENABLE_PLUGINS)
        set(HAVE_PLUGINS 1)
        set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
        set(PLUGIN_SRC_DIRS
-               plugins/asn1
                plugins/docsis
                plugins/ethercat
                plugins/gryphon
@@ -621,12 +666,13 @@ endforeach()
 add_subdirectory( asn1 EXCLUDE_FROM_ALL )
 add_subdirectory( codecs )
 add_subdirectory( epan )
+add_subdirectory( filetap )
 add_subdirectory( tools/lemon )
 add_subdirectory( ui )
 add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
-add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil color.h)
+add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libfiletap dumpabi-libwiretap dumpabi-libwsutil color.h)
 
 if(ENABLE_ECHLD)
        add_subdirectory( echld )
@@ -682,13 +728,39 @@ else()
 endif()
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
+if( ENABLE_GUIDES )
+       configure_file(
+               ${CMAKE_SOURCE_DIR}/doxygen_global.cfg
+               ${CMAKE_BINARY_DIR}/doxygen_global.cfg
+       )
+       configure_file(
+               ${CMAKE_SOURCE_DIR}/ui/qt/doxygen.cfg.in
+               ${CMAKE_BINARY_DIR}/ui/qt/doxygen.cfg
+       )
+       configure_file(
+               ${CMAKE_SOURCE_DIR}/ui/gtk/doxygen.cfg.in
+               ${CMAKE_BINARY_DIR}/ui/gtk/doxygen.cfg
+       )
+       configure_file(
+               ${CMAKE_SOURCE_DIR}/ui/doxygen.cfg.in
+               ${CMAKE_BINARY_DIR}/ui/doxygen.cfg
+       )
+       configure_file(
+               ${CMAKE_SOURCE_DIR}/epan/doxygen.cfg.in
+               ${CMAKE_BINARY_DIR}/epan/doxygen.cfg
+       )
+       configure_file(
+               ${CMAKE_SOURCE_DIR}/doxygen.cfg.in
+               ${CMAKE_BINARY_DIR}/doxygen.cfg
+       )
+endif()
 
 set( configure_input "Built with CMake ${CMAKE_VERSION}" )
 set( VERSION ${PROJECT_VERSION} )
 
 configure_file(
        ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist.in
-       ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist
+       ${CMAKE_BINARY_DIR}/packaging/macosx/Info.plist
        @ONLY)
 
 include(FeatureSummary)
@@ -703,6 +775,7 @@ link_directories(
        ${CMAKE_BINARY_DIR}/ui/qt
        ${CMAKE_BINARY_DIR}/codecs
        ${CMAKE_BINARY_DIR}/epan
+       ${CMAKE_BINARY_DIR}/filetap
        ${CMAKE_BINARY_DIR}/wiretap
        ${CMAKE_BINARY_DIR}/wsutil
 )
@@ -727,13 +800,13 @@ ADD_CUSTOM_COMMAND(
 )
 
 if(UNIX)
-       set(PLATFORM_CAPTURE_SRC
+       set(PLATFORM_PCAP_SRC
                capture-pcap-util-unix.c
        )
 endif()
 
 if(WIN32)
-       set(PLATFORM_CAPTURE_SRC
+       set(PLATFORM_PCAP_SRC
                capture_win_ifnames.c
                capture-wpcap.c
                capture_wpcap_packet.c
@@ -745,18 +818,9 @@ if(WIN32)
        )
 endif()
 
-set(WTAP_PLUGIN_SOURCES
-       epan/plugins.c
-       epan/filesystem.c
-)
-
-set(SHARK_COMMON_CAPTURE_SRC
-       capture_ifinfo.c
-       capture_ui_utils.c
-)
-
-set(WIRESHARK_COMMON_SRC
-       ${PLATFORM_CAPTURE_SRC}
+# sources common for wireshark, tshark, and rawshark
+set(SHARK_COMMON_SRC
+       ${PLATFORM_PCAP_SRC}
        capture-pcap-util.c
        cfile.c
        cfutils.c
@@ -767,6 +831,14 @@ set(WIRESHARK_COMMON_SRC
        version_info.c
 )
 
+# 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
+)
+
 set(TSHARK_TAP_SRC
        ui/cli/tap-afpstat.c
        ui/cli/tap-ansi_astat.c
@@ -822,6 +894,7 @@ set(INSTALL_FILES
        ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
        COPYING
        ${CMAKE_BINARY_DIR}/capinfos.html
+       ${CMAKE_BINARY_DIR}/captype.html
        cfilters
        colorfilters
        dfilters
@@ -874,7 +947,6 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
                capture.c
                capture_info.c
                capture_opts.c
-               capture_sync.c
                color_filters.c
                file.c
                fileset.c
@@ -884,7 +956,7 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
                summary.c
                ws80211_utils.c
                ${SHARK_COMMON_CAPTURE_SRC}
-               ${WIRESHARK_COMMON_SRC}
+               ${SHARK_COMMON_SRC}
                ${PLATFORM_UI_SRC}
        )
 endif()
@@ -939,7 +1011,7 @@ if(BUILD_qtshark AND QT_FOUND)
 endif()
 
 register_tap_files(tshark-tap-register.c
-        tshark-taps
+               tshark-taps
        ${TSHARK_TAP_SRC}
 )
 
@@ -952,12 +1024,11 @@ if(BUILD_tshark)
        )
        set(tshark_FILES
                capture_opts.c
-               capture_sync.c
                tshark-tap-register.c
                tshark.c
                ${TSHARK_TAP_SRC}
                ${SHARK_COMMON_CAPTURE_SRC}
-               ${WIRESHARK_COMMON_SRC}
+               ${SHARK_COMMON_SRC}
        )
        add_executable(tshark ${tshark_FILES})
        add_dependencies(tshark svnversion)
@@ -967,6 +1038,28 @@ if(BUILD_tshark)
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
+if(BUILD_tfshark)
+       set(tfshark_LIBS
+               filetap
+               ui
+               ${LIBEPAN_LIBS}
+               ${APPLE_CORE_FOUNDATION_LIBRARY}
+               ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
+       )
+       set(tfshark_FILES
+               tfshark.c
+               tshark-tap-register.c
+               ${TSHARK_TAP_SRC}
+               ${SHARK_COMMON_SRC}
+       )
+       add_executable(tfshark ${tfshark_FILES})
+       add_dependencies(tfshark svnversion)
+       set_target_properties(tfshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(tfshark PROPERTIES FOLDER "Executables")
+       target_link_libraries(tfshark ${tfshark_LIBS})
+       install(TARGETS tfshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
 if(BUILD_rawshark AND PCAP_FOUND)
        set(rawshark_LIBS
                ${LIBEPAN_LIBS}
@@ -974,7 +1067,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
                ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
        )
        set(rawshark_FILES
-               ${WIRESHARK_COMMON_SRC}
+               ${SHARK_COMMON_SRC}
                rawshark.c
                ui/util.c
        )
@@ -1056,7 +1149,6 @@ if(BUILD_mergecap)
        set(mergecap_FILES
                mergecap.c
                svnversion.h
-               ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(mergecap ${mergecap_FILES})
        add_dependencies(mergecap svnversion)
@@ -1075,7 +1167,6 @@ if(BUILD_reordercap)
        set(reordercap_FILES
                reordercap.c
                svnversion.h
-               ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(reordercap ${reordercap_FILES})
        add_dependencies(reordercap svnversion)
@@ -1095,7 +1186,6 @@ if(BUILD_capinfos)
        )
        set(capinfos_FILES
                capinfos.c
-               ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(capinfos ${capinfos_FILES})
        add_dependencies(capinfos svnversion)
@@ -1105,6 +1195,24 @@ if(BUILD_capinfos)
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
+if(BUILD_captype)
+       set(captype_LIBS
+               wiretap
+               wsutil
+               ${ZLIB_LIBRARIES}
+               ${CMAKE_DL_LIBS}
+       )
+       set(captype_FILES
+               captype.c
+       )
+       add_executable(captype ${captype_FILES})
+       add_dependencies(captype svnversion)
+       set_target_properties(captype PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(captype PROPERTIES FOLDER "Executables")
+       target_link_libraries(captype ${captype_LIBS})
+       install(TARGETS captype RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
 if(BUILD_editcap)
        set(editcap_LIBS
                wiretap
@@ -1113,7 +1221,6 @@ if(BUILD_editcap)
        )
        set(editcap_FILES
                editcap.c
-               ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(editcap ${editcap_FILES})
        add_dependencies(editcap svnversion)
@@ -1151,14 +1258,34 @@ if(BUILD_dumpcap AND PCAP_FOUND)
                sync_pipe_write.c
                version_info.c
                ws80211_utils.c
-               ${PLATFORM_CAPTURE_SRC}
+               ${PLATFORM_PCAP_SRC}
        )
        add_executable(dumpcap ${dumpcap_FILES})
        add_dependencies(dumpcap svnversion)
        set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        set_target_properties(dumpcap PROPERTIES FOLDER "Executables")
        target_link_libraries(dumpcap ${dumpcap_LIBS})
-       install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+       install(TARGETS dumpcap
+                       RUNTIME
+                       DESTINATION ${CMAKE_INSTALL_BINDIR}
+                       PERMISSIONS ${DUMPCAP_SETUID}
+                               OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                               GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+       )
+       if(DUMPCAP_INSTALL_OPTION STREQUAL "capabilities")
+               install( CODE "execute_process(
+                       COMMAND
+                               ${SETCAP_EXECUTABLE}
+                               cap_net_raw,cap_net_admin+ep
+                               ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/dumpcap${CMAKE_EXECUTABLE_SUFFIX}
+                       RESULT_VARIABLE
+                               _SETCAP_RESULT
+                       )
+                       if( _SETCAP_RESULT )
+                               message( WARNING \"setcap failed (${_SETCAP_RESULT}).\")
+                       endif()"
+               )
+       endif()
 endif()
 
 ADD_CUSTOM_COMMAND(
@@ -1194,6 +1321,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 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 )
@@ -1214,6 +1342,7 @@ add_custom_target(
        DEPENDS
                AUTHORS-SHORT
                capinfos.html
+               captype.html
                dftest.html
                dumpcap.html
                editcap.html
@@ -1233,6 +1362,7 @@ set_target_properties(auxiliary PROPERTIES FOLDER "Docs")
 
 set(MAN1_FILES
        ${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
@@ -1259,6 +1389,7 @@ set(CLEAN_FILES
        ${text2pcap_CLEAN_FILES}
        ${mergecap_FILES}
        ${capinfos_FILES}
+       ${captype_FILES}
        ${editcap_FILES}
        ${dumpcap_FILES}
 )
@@ -1306,6 +1437,11 @@ install(
        PATTERN "faq.py" EXCLUDE
 )
 
+include( UseCheckAPI )
+CHECKAPI(
+                  ${TSHARK_TAP_SRC}
+                  ${wireshark_FILES}
+)
 
 if(DOC_DIR)
        message(STATUS "Docdir install: ${DOC_DIR}")