Update some links.
[obnox/wireshark/wip.git] / CMakeLists.txt
index a6e35063f09191395a08359252586d45f6820ee5..98c0bdae6641e92af5152b99d2842895d7ce8245 100644 (file)
 project(Wireshark C)
 
 cmake_minimum_required(VERSION 2.6)
+set(CMAKE_BACKWARDS_COMPATIBILITY 2.6)
+
+# 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)
+       file(STRINGS
+               ${CMAKE_SOURCE_DIR}/configure.in
+               VERSIONLINE
+               REGEX "\\(wireshark, .*\\)"
+       )
+       string(REGEX REPLACE ".*\\(wireshark, (.*)\\).*"
+               "\\1"
+               PROJECT_VERSION
+               ${VERSIONLINE}
+       )
+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}
+)
+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
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
@@ -36,8 +75,6 @@ INCLUDE(UseMakeTapReg)
 # Disable this later. Alternative: "make VERBOSE=1"
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
-set(BUILD_SHARED_LIBS ON)
-
 #Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ...
 include(CMakeInstallDirs)
 
@@ -55,45 +92,12 @@ if(NOT LIBRARY_OUTPUT_PATH)
                   "Single output directory for building all libraries.")
 endif()
 
-option(BUILD_wireshark   "Build the GUI version of Wireshark" ON)
-option(BUILD_tshark      "Build tshark" ON)
-option(BUILD_rawshark    "Build rawshark" ON)
-option(BUILD_dumpcap     "Build dumpcap" ON)
-option(BUILD_text2pcap   "Build text2pcap" ON)
-option(BUILD_mergecap    "Build mergecap" ON)
-option(BUILD_editcap     "Build editcap" ON)
-option(BUILD_capinfos    "Build capinfos" ON)
-option(BUILD_randpkt     "Build randpkt" ON)
-option(BUILD_dftest      "Build dftest" ON)
-option(AUTOGEN_dcerpc    "Autogenerate dcerpc dissectors" OFF)
-option(AUTOGEN_pidl      "Autogenerate pidl dissectors" OFF)
-
-option(DISABLE_WERROR   "Do not treat Warnings as errors" OFF)
-option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" ON)
-option(ENABLE_AIRPCAP   "Enable Airpcap support" ON)
-# todo
-option(ENABLE_STATIC     "Build a static version of Wireshark" OFF)
-option(ENABLE_PLUGINS    "Build with plugins" ON)
-
-option(ENABLE_ADNS       "Build with adns support" ON)
-option(ENABLE_PCRE       "Build with pcre support" ON)
-option(ENABLE_PORTAUDIO  "Build with portaudio support" ON)
-option(ENABLE_Z          "Build with zlib compression support" ON)
-option(ENABLE_LUA       "Build with lua dissector support" ON)
-option(ENABLE_PYTHON    "Build with python dissector support" ON)
-option(ENABLE_SMI       "Build with smi snmp support" ON)
-option(ENABLE_GNUTLS    "Build with GNU TLS support" ON)
-option(ENABLE_GCRYPT    "Build with GNU crypto support" ON)
-option(ENABLE_GEOIP     "Build with GeoIP support" ON)
-option(ENABLE_CAP       "Build with posix capabilities support" ON)
-option(ENABLE_CARES      "Build with c_ares support" ON)
-# todo Mostly hardcoded
-option(ENABLE_KERBEROS  "Build with Kerberos support" ON)
+
+include(CMakeOptions.txt)
 
 
 set(WIRESHARK_C_FLAGS
        -O2
-       -Werror
        -Wall
        -W
        -Wextra
@@ -104,6 +108,7 @@ set(WIRESHARK_C_FLAGS
        -Warray-bounds
        -Wcast-align
        -Wformat-security
+       -fexcess-precision=fast
 )
 
 set(WIRESHARK_EXTRA_C_FLAGS
@@ -126,6 +131,8 @@ 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
@@ -136,7 +143,7 @@ set(WIRESHARK_EXTRA_C_FLAGS
        -Wshorten-64-to-32
 )
 
-if(ENABLE_EXTRA_GCC_CHECKS)
+if(ENABLE_EXTRA_GCC_CHECKS)   # This overrides -Werror
        set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_C_FLAGS})
 endif()
 
@@ -161,8 +168,10 @@ foreach(THIS_FLAG ${WIRESHARK_C_FLAGS})
        math(EXPR C "${C} + 1")
 endforeach()
 
-if(DISABLE_WERROR OR ENABLE_EXTRA_GCC_CHECKS)
-       remove_definitions( -Werror )
+if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
+       check_c_compiler_flag(-Werror WERROR)
+else()
+       set(WERROR 0)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
@@ -171,9 +180,41 @@ else()
        add_definitions( -D_U_=\"\" )
 endif()
 
-# todo
-# Same for linker flags, but it looks like it's do-it-yourself here
-# AC_WIRESHARK_GCC_LDFLAGS_CHECK([-Wl,--as-needed])
+set(WIRESHARK_LD_FLAGS
+       -Wl,--as-needed
+       # -flto
+       # -fwhopr
+       # -fwhole-program
+)
+
+include(CheckCLinkerFlag)
+set(C 0)
+# Sigh: Have to use THIS_FLAG instead of ${F} for some reason
+foreach(THIS_FLAG ${WIRESHARK_LD_FLAGS})
+       set(F WS_LD_FLAG_${C})
+       set(${F} ${THIS_FLAG})
+       set(V WS_LD_FLAG_VALID${C})
+       check_c_linker_flag(${${F}} ${V})
+       if (${${V}})
+               set(WS_LINK_FLAGS ${WS_LINK_FLAGS} ${${F}})
+       endif()
+       math(EXPR C "${C} + 1")
+endforeach()
+
+if(ENABLE_STATIC)
+  set(LINK_MODE_LIB STATIC)
+  set(LINK_MODE_MODULE STATIC)
+else()
+  set(LINK_MODE_LIB SHARED)
+  set(LINK_MODE_MODULE MODULE)
+endif()
+
+# The packagelist is doing some magic:  If we add XXX to the packagelist, we
+# - may optionally set XXX_OPTIONS to pass to the find_package command
+# - will call FindXXX.cmake
+# - return found libraries in XXX_LIBRARIES
+# - return found include in XXX_INCLUDE_DIRS
+# - set HAVE_XXX
 
 #The minimum package list
 set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGELIST})
@@ -181,6 +222,8 @@ set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGEL
 #Build the gui ?
 if(BUILD_wireshark)
        set(PACKAGELIST GTK2 ${PACKAGELIST})
+       set(GTK2_OPTIONS COMPONENTS gtk)
+       set(GTK2_DEBUG false)
 endif()
 
 # SMI SNMP
@@ -222,8 +265,8 @@ elseif(ENABLE_ADNS)     # Gnu asynchronous DNS
 endif()
 
 # Zlib compression
-if(ENABLE_Z)
-       set(PACKAGELIST Z ${PACKAGELIST})
+if(ENABLE_ZLIB)
+       set(PACKAGELIST ZLIB ${PACKAGELIST})
 endif()
 
 # Lua 5.1 dissectors
@@ -249,7 +292,11 @@ set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
 
 #Let's loop the package list
 foreach(PACKAGE ${PACKAGELIST})
-       find_package(${PACKAGE} REQUIRED)
+       if(${PACKAGE}_OPTIONS)
+               find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
+       else()
+               find_package(${PACKAGE} REQUIRED)
+       endif()
        message(${PACKAGE}_FOUND)
        if (${PACKAGE}_FOUND)
                set(HAVE_LIB${PACKAGE} 1)
@@ -261,9 +308,12 @@ endforeach()
 
 find_package(YAPP)
 
+#packaging
+include(CPackConfig.txt)
+
 if(HAVE_LIBPYTHON)
        set(HAVE_PYTHON 1)
-       set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${VERSION}")
+       set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${CPACK_PACKAGE_VERSION}")
 endif()
 if(HAVE_LIBLUA)
        set(HAVE_LUA_H 1)
@@ -287,6 +337,10 @@ endif()
 if(ENABLE_AIRPCAP)
        set(HAVE_AIRPCAP 1)
 endif()
+# That's the name autofoo uses
+if(HAVE_LIBZLIB)
+       set(HAVE_LIBZ 1)
+endif()
 
 include(ConfigureChecks.cmake)
 
@@ -294,22 +348,6 @@ include(ConfigureChecks.cmake)
 include(TestBigEndian)
 test_big_endian(WORDS_BIGENDIAN)
 
-#packaging
-set(CPACK_PACKAGE_NAME wireshark)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet")
-set(CPACK_PACKAGE_VENDOR "wireshark")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "2")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
-set(CPACK_GENERATOR "TGZ")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-
 set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}")
 
 if(ENABLE_PLUGINS)
@@ -321,6 +359,7 @@ if(ENABLE_PLUGINS)
                plugins/ethercat
                plugins/giop
                plugins/gryphon
+               plugins/interlink
                plugins/irda
                plugins/m2m
                plugins/mate
@@ -354,6 +393,12 @@ add_subdirectory( tools/lemon )
 add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
+if(ENABLE_GUIDES)
+       add_subdirectory( docbook )
+endif()
+
+find_package(POD)
+
 #Platform specific
 if(UNIX)
        set(WS_VAR_IMPORT "extern")
@@ -391,8 +436,17 @@ link_directories(
        wsutil
 )
 
+ADD_CUSTOM_TARGET(
+       svnversion ALL
+       COMMAND ${PERL}
+               ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
+               ${CMAKE_CURRENT_SOURCE_DIR}
+       DEPENDS
+               ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
+)
+
 ADD_CUSTOM_COMMAND(
-       OUTPUT svnversion.h
+       OUTPUT  svnversion.h
        COMMAND ${PERL}
                ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
                ${CMAKE_CURRENT_SOURCE_DIR}
@@ -405,14 +459,14 @@ register_tap_files(tshark-tap-register.c
 )
 
 ADD_CUSTOM_COMMAND(
-       OUTPUT ps.c
-       COMMAND ${PYTHON_EXECUTABLE}
-         ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
-         ${CMAKE_CURRENT_SOURCE_DIR}/print.ps
-         ps.c
+       OUTPUT  ps.c
+       COMMAND ${PYTHON_EXECUTABLE}
+               ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
+               ${CMAKE_CURRENT_SOURCE_DIR}/print.ps
+               ps.c
        DEPENDS
-         ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
-         ${CMAKE_CURRENT_SOURCE_DIR}/print.ps
+               ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
+               ${CMAKE_CURRENT_SOURCE_DIR}/print.ps
 )
 
 if(UNIX)
@@ -433,17 +487,22 @@ set(WTAP_PLUGIN_SOURCES
        epan/filesystem.c
 )
 
+set(SHARK_COMMON_CAPTURE_SRC
+       capture_errs.c
+       capture_ifinfo.c
+       capture_ui_utils.c
+)
+
 set(WIRESHARK_COMMON_SRC
        ${PLATFORM_SRC}
-       capture_errs.c
        capture-pcap-util.c
-       capture_ui_utils.c
        cfile.c
        clopts_common.c
        disabled_protos.c
        packet-range.c
        print.c
        ps.c
+       svnversion.h
        sync_pipe_write.c
        timestats.c
        util.c
@@ -453,34 +512,36 @@ set(WIRESHARK_COMMON_SRC
 )
 
 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-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-sctpchunkstat.c
-        tap-sipstat.c
-        tap-smbsids.c
-        tap-smbstat.c
-        tap-stats_tree.c
-        tap-wspstat.c
+       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-sctpchunkstat.c
+       tap-sipstat.c
+       tap-smbsids.c
+       tap-smbstat.c
+       tap-stats_tree.c
+       tap-sv.c
+       tap-wspstat.c
 )
 
 set(INSTALL_DIRS
@@ -495,51 +556,46 @@ set(INSTALL_DIRS
 set(INSTALL_FILES
        ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
        COPYING
-#      capinfos.html
+       ${CMAKE_BINARY_DIR}/capinfos.html
        cfilters
        colorfilters
-#      console.lua
        dfilters
-#      dtd_gen.lua
-#      dumpcap.html
-#      editcap.html
-#      idl2wrs.html
-#      init.lua
-#      ipmap.html
+       ${CMAKE_BINARY_DIR}/dftest.html
+       ${CMAKE_BINARY_DIR}/dumpcap.html
+       ${CMAKE_BINARY_DIR}/editcap.html
+       ${CMAKE_BINARY_DIR}/idl2wrs.html
+       ipmap.html
        manuf
-#      mergecap.html
-#      rawshark.html
+       ${CMAKE_BINARY_DIR}/mergecap.html
+       ${CMAKE_BINARY_DIR}/randpkt.html
+       ${CMAKE_BINARY_DIR}/rawshark.html
        services
        smi_modules
-#      text2pcap.html
-#      tshark.html
-#      wireshark-filter.html
-#      wireshark.html
-#      ws.css
+       ${CMAKE_BINARY_DIR}/text2pcap.html
+       ${CMAKE_BINARY_DIR}/tshark.html
+       ${CMAKE_BINARY_DIR}/wireshark-filter.html
+       ${CMAKE_BINARY_DIR}/wireshark.html
+       docbook/ws.css
 )
 
 set(LIBEPAN_LIBS
-#              $(wireshark_optional_objects)
+#              @NSL_LIBS@      # -lnsl
+#              @SOCKET_LIBS@   # -lsocket
+#              @SSL_LIBS@      # -lcrypto
                epan
-#              @INET_PTON_LO@
-#              @INET_NTOP_LO@
-#              @SSL_LIBS@
-#              $(plugin_ldadd)
+#              $(plugin_ldadd) # in case of static
                ${PCRE_LIBRARIES}
                ${PCAP_LIBRARIES}
-#              @SOCKET_LIBS@
-#              @NSL_LIBS@
                ${CARES_LIBRARIES}
                ${ADNS_LIBRARIES}
                ${KERBEROS_LIBRARIES}
-#              @FRAMEWORKS@
                ${LUA_LIBRARIES}
                ${PYTHON_LIBRARIES}
                ${GEOIP_LIBRARIES}
                ${GCRYPT_LIBRARIES}
                ${GNUTLS_LIBRARIES}
                ${SMI_LIBRARIES}
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
                ${M_LIBRARIES}
 )
 
@@ -569,9 +625,12 @@ if(BUILD_wireshark)
                proto_hier_stats.c
                summary.c
                tempfile.c
+               ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
        )
        add_executable(wireshark ${wireshark_FILES})
+       add_dependencies(wireshark svnversion)
+       set_target_properties(wireshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(wireshark ${wireshark_LIBS})
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -588,9 +647,12 @@ if(BUILD_tshark)
                tshark-tap-register.c
                tshark.c
                ${TSHARK_TAP_SRC}
+               ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
        )
        add_executable(tshark ${tshark_FILES})
+       add_dependencies(tshark svnversion)
+       set_target_properties(tshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(tshark ${tshark_LIBS})
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -605,6 +667,8 @@ if(BUILD_rawshark)
                rawshark.c
        )
        add_executable(rawshark ${rawshark_FILES})
+       add_dependencies(rawshark svnversion)
+       set_target_properties(rawshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(rawshark ${rawshark_LIBS})
        install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -618,6 +682,7 @@ if(BUILD_dftest)
                util.c
        )
        add_executable(dftest ${dftest_FILES})
+       set_target_properties(dftest PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(dftest ${dftest_LIBS})
        install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -631,12 +696,13 @@ if(BUILD_randpkt)
 #              @NSL_LIBS@
                ${CARES_LIBRARIES}
                ${ADNS_LIBRARIES}
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
        )
        set(randpkt_FILES
                randpkt.c
        )
        add_executable(randpkt ${randpkt_FILES})
+       set_target_properties(randpkt PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(randpkt ${randpkt_LIBS})
        install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -645,15 +711,20 @@ if(BUILD_text2pcap)
        set(text2pcap_LIBS
                wiretap
                ${M_LIBRARIES}
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
        )
-       set(text2pcap_FILES
+       set(text2pcap_CLEAN_FILES
                text2pcap.c
        )
+       set(text2pcap_FILES
+               ${text2pcap_CLEAN_FILES}
+       )
        add_lex_files(text2pcap_FILES
                text2pcap-scanner.l
        )
        add_executable(text2pcap ${text2pcap_FILES})
+       add_dependencies(text2pcap svnversion)
+       set_target_properties(text2pcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(text2pcap ${text2pcap_LIBS})
        install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -661,7 +732,7 @@ endif()
 if(BUILD_mergecap)
        set(mergecap_LIBS
                wiretap
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
        )
        set(mergecap_FILES
                mergecap.c
@@ -669,6 +740,8 @@ if(BUILD_mergecap)
                svnversion.h
        )
        add_executable(mergecap ${mergecap_FILES})
+       add_dependencies(mergecap svnversion)
+       set_target_properties(mergecap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(mergecap ${mergecap_LIBS})
        install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -676,7 +749,8 @@ endif()
 if(BUILD_capinfos)
        set(capinfos_LIBS
                wiretap
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
+               ${GCRYPT_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
        )
        set(capinfos_FILES
@@ -684,6 +758,8 @@ if(BUILD_capinfos)
                ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(capinfos ${capinfos_FILES})
+       add_dependencies(capinfos svnversion)
+       set_target_properties(capinfos PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(capinfos ${capinfos_LIBS})
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -691,7 +767,7 @@ endif()
 if(BUILD_editcap)
        set(editcap_LIBS
                wiretap
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
        )
        set(editcap_FILES
                editcap.c
@@ -700,6 +776,8 @@ if(BUILD_editcap)
                ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(editcap ${editcap_FILES})
+       add_dependencies(editcap svnversion)
+       set_target_properties(editcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(editcap ${editcap_LIBS})
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -712,10 +790,7 @@ if(BUILD_dumpcap)
                ${CAP_LIBRARIES}
 #              @SOCKET_LIBS@
 #              @NSL_LIBS@
-#              @FRAMEWORKS@
-               ${GCRYPT_LIBRARIES}
-               ${GNUTLS_LIBRARIES}
-               ${Z_LIBRARIES}
+               ${ZLIB_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
        )
        set(dumpcap_FILES
@@ -734,6 +809,8 @@ if(BUILD_dumpcap)
                ${PLATFORM_SRC}
        )
        add_executable(dumpcap ${dumpcap_FILES})
+       add_dependencies(dumpcap svnversion)
+       set_target_properties(dumpcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
        target_link_libraries(dumpcap ${dumpcap_LIBS})
        install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -751,13 +828,95 @@ ADD_CUSTOM_COMMAND(
                ${CMAKE_SOURCE_DIR}/AUTHORS
 )
 
+ADD_CUSTOM_COMMAND(
+       OUTPUT  AUTHORS-SHORT-FORMAT
+               wireshark.pod
+       COMMAND ${PERL}
+               ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
+               ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
+               < AUTHORS-SHORT
+               > AUTHORS-SHORT-FORMAT
+       COMMAND cat
+               ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
+               AUTHORS-SHORT-FORMAT
+               > wireshark.pod
+       DEPENDS
+               ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
+               ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
+               AUTHORS-SHORT
+               ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
+)
+
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/capinfos 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/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/text2pcap 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
+pod2manhtml( wireshark 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/wireshark-filter 4 )
+
 add_custom_target(
        auxiliary ALL
        DEPENDS
                AUTHORS-SHORT
-               # todo: Add manpages and onlinedocs and generate them
+               capinfos.html
+               dftest.html
+               dumpcap.html
+               editcap.html
+               idl2wrs.html
+               mergecap.html
+               randpkt.html
+               rawshark.html
+               text2pcap.html
+               tshark.html
+               wireshark.html
+               wireshark-filter.html
+)
+
+set(MAN1_FILES
+       ${CMAKE_BINARY_DIR}/capinfos.1
+       ${CMAKE_BINARY_DIR}/dftest.1
+       ${CMAKE_BINARY_DIR}/dumpcap.1
+       ${CMAKE_BINARY_DIR}/editcap.1
+       ${CMAKE_BINARY_DIR}/idl2wrs.1
+       ${CMAKE_BINARY_DIR}/mergecap.1
+       ${CMAKE_BINARY_DIR}/randpkt.1
+       ${CMAKE_BINARY_DIR}/rawshark.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(CLEAN_FILES
+       ${wireshark_FILES}
+       ${tshark_FILES}
+       ${rawshark_FILES}
+       ${dftest_FILES}
+       ${randpkt_FILES}
+       ${text2pcap_CLEAN_FILES}
+       ${mergecap_FILES}
+       ${capinfos_FILES}
+       ${editcap_FILES}
+       ${dumpcap_FILES}
+)
+
+if (WERROR)
+       set_source_files_properties(
+               ${CLEAN_FILES}
+               PROPERTIES
+               COMPILE_FLAGS -Werror
+       )
+endif()
+
 install(
        FILES
                ${INSTALL_FILES}
@@ -765,6 +924,20 @@ 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(
        DIRECTORY
                ${INSTALL_DIRS}