Add a "fallthrough" comment to avoid a missing break report from Coverity. Fixes...

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c62709d63715d87d8255a8876d38e8cda490038e..b90ca1c8aafbe920595d75effe125e53c1832261 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,15 +108,17 @@ set(WIRESHARK_C_FLAGS
        -Wall
        -W
        -Wextra
-       -Wdeclaration-after-statement
        -Wendif-labels
        -Wpointer-arith
-       -Wno-pointer-sign
        -Warray-bounds
        -Wcast-align
        -Wformat-security
-       -Wold-style-definition
        -fexcess-precision=fast
+
+       # The following are C only, not C++
+       -Wdeclaration-after-statement
+       -Wno-pointer-sign
+       -Wold-style-definition
 )
 
 set(WIRESHARK_EXTRA_C_FLAGS
@@ -128,7 +130,6 @@ set(WIRESHARK_EXTRA_C_FLAGS
        -Wunreachable-code
        -Wunsafe-loop-optimizations
        -Wno-long-long
-       -Wbad-function-cast
        -Wcast-qual
        -Waddress
        -Warray-bounds
@@ -139,19 +140,23 @@ 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
-       # GLib blocks this for now.
-       -Wstrict-prototypes
        # All the registration functions block these for now.
-       -Wmissing-prototypes
        -Wmissing-declarations
        # Problem with packet-afs.c
        -Wshadow
        # More cleanup needed for this on LP64
        -Wshorten-64-to-32
+
+       # The following are C only, not C++
+       -Wbad-function-cast
+       -Wc++-compat
+       -Wjump-misses-init
+       # GLib blocks this for now.
+       -Wstrict-prototypes
+       # All the registration functions block these for now.
+       -Wmissing-prototypes
 )
 
 if(ENABLE_EXTRA_GCC_CHECKS)   # This overrides -Werror
@@ -449,7 +454,7 @@ endif()
 
 
 # Basedir where to install guides
-set(DOC_DIR "$ENV{docdir}")
+set(DOC_DIR "$ENV{docdir}" CACHE FILEPATH "Installation directory for ug and dg pdfs.")
 message(STATUS "docdir: ${DOC_DIR}")
 
 if(ENABLE_GUIDES)
@@ -567,51 +572,51 @@ set(WIRESHARK_COMMON_SRC
        svnversion.h
        sync_pipe_write.c
        timestats.c
-       util.c
        tap-megaco-common.c
        tap-rtp-common.c
        version_info.c
 )
 
 set(TSHARK_TAP_SRC
-       tap-afpstat.c
-       tap-ansi_astat.c
-       tap-bootpstat.c
-       tap-camelcounter.c
-       tap-camelsrt.c
-       tap-comparestat.c
-       tap-dcerpcstat.c
-       tap-diameter-avp.c
-       tap-expert.c
-       tap-funnel.c
-       tap-gsm_astat.c
-       tap-h225counter.c
-       tap-h225rassrt.c
-       tap-hosts.c
-       tap-httpstat.c
-       tap-icmpstat.c
-       tap-icmpv6stat.c
-       tap-iostat.c
-       tap-iousers.c
-       tap-macltestat.c
-       tap-mgcpstat.c
-       tap-megacostat.c
-       tap-protocolinfo.c
-       tap-protohierstat.c
-       tap-radiusstat.c
-       tap-rlcltestat.c
-       tap-rpcstat.c
-       tap-rpcprogs.c
-       tap-rtp.c
-       tap-rtspstat.c
-       tap-scsistat.c
-       tap-sctpchunkstat.c
-       tap-sipstat.c
-       tap-smbsids.c
-       tap-smbstat.c
-       tap-stats_tree.c
-       tap-sv.c
-       tap-wspstat.c
+       ui/cli/tap-afpstat.c
+       ui/cli/tap-ansi_astat.c
+       ui/cli/tap-bootpstat.c
+       ui/cli/tap-camelcounter.c
+       ui/cli/tap-camelsrt.c
+       ui/cli/tap-comparestat.c
+       ui/cli/tap-dcerpcstat.c
+       ui/cli/tap-diameter-avp.c
+       ui/cli/tap-expert.c
+       ui/cli/tap-follow.c
+       ui/cli/tap-funnel.c
+       ui/cli/tap-gsm_astat.c
+       ui/cli/tap-h225counter.c
+       ui/cli/tap-h225rassrt.c
+       ui/cli/tap-hosts.c
+       ui/cli/tap-httpstat.c
+       ui/cli/tap-icmpstat.c
+       ui/cli/tap-icmpv6stat.c
+       ui/cli/tap-iostat.c
+       ui/cli/tap-iousers.c
+       ui/cli/tap-macltestat.c
+       ui/cli/tap-mgcpstat.c
+       ui/cli/tap-megacostat.c
+       ui/cli/tap-protocolinfo.c
+       ui/cli/tap-protohierstat.c
+       ui/cli/tap-radiusstat.c
+       ui/cli/tap-rlcltestat.c
+       ui/cli/tap-rpcstat.c
+       ui/cli/tap-rpcprogs.c
+       ui/cli/tap-rtp.c
+       ui/cli/tap-rtspstat.c
+       ui/cli/tap-scsistat.c
+       ui/cli/tap-sctpchunkstat.c
+       ui/cli/tap-sipstat.c
+       ui/cli/tap-smbsids.c
+       ui/cli/tap-smbstat.c
+       ui/cli/tap-stats_tree.c
+       ui/cli/tap-sv.c
+       ui/cli/tap-wspstat.c
 )
 
 set(INSTALL_DIRS
@@ -672,7 +677,6 @@ set(LIBEPAN_LIBS
 if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
        set(wireshark_FILES
                airpcap_loader.c
-               alert_box.c
                capture.c
                capture_info.c
                capture_opts.c
@@ -688,6 +692,8 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
                summary.c
                tempfile.c
                u3.c
+               ui/alert_box.c
+               ui/util.c
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
        )
@@ -749,6 +755,7 @@ if(BUILD_tshark)
                tempfile.c
                tshark-tap-register.c
                tshark.c
+               ui/util.c
                ${TSHARK_TAP_SRC}
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
@@ -768,6 +775,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
        set(rawshark_FILES
                ${WIRESHARK_COMMON_SRC}
                rawshark.c
+               ui/util.c
        )
        add_executable(rawshark ${rawshark_FILES})
        add_dependencies(rawshark svnversion)
@@ -782,7 +790,7 @@ if(BUILD_dftest)
        )
        set(dftest_FILES
                dftest.c
-               util.c
+               ui/util.c
        )
        add_executable(dftest ${dftest_FILES})
        set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -1057,9 +1065,9 @@ install(
        PATTERN "faq.py" EXCLUDE
 )
 
-message(STATUS "Debugging docdir install: ${DOC_DIR}")
 
-if(${DOC_DIR})
+if(DOC_DIR)
+       message(STATUS "Docdir install: ${DOC_DIR}")
        INSTALL(
                DIRECTORY
                        ${CMAKE_BINARY_DIR}/docbook/
@@ -1069,7 +1077,8 @@ if(${DOC_DIR})
                        WORLD_EXECUTE WORLD_READ
                DESTINATION
                        ${DOC_DIR}/guides
-#              PATTERN "*.pdf" 
+               FILES_MATCHING
+               PATTERN "*.pdf"
        )
 endif()