ISO14443: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index be40704eec000f78ce558c3e92c92c141d4d9a04..6635e75eced34104e7e08ddfe58d358ab5f92b44 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -76,6 +76,7 @@ set(DFILTER_FILES
        dfilter/sttype-integer.c
        dfilter/sttype-pointer.c
        dfilter/sttype-range.c
+       dfilter/sttype-set.c
        dfilter/sttype-string.c
        dfilter/sttype-test.c
        dfilter/syntax-tree.c
@@ -190,6 +191,7 @@ set(PIDL_DISSECTOR_SRC
        dissectors/packet-dcerpc-rfr.c
        dissectors/packet-dcerpc-srvsvc.c
        dissectors/packet-dcerpc-winreg.c
+       dissectors/packet-dcerpc-witness.c
        dissectors/packet-dcerpc-wkssvc.c
        dissectors/packet-dcerpc-wzcsvc.c
 )
@@ -252,11 +254,14 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-novell_pkis.c
        dissectors/packet-ns_cert_exts.c
        dissectors/packet-ocsp.c
+       dissectors/packet-p1.c
        dissectors/packet-p22.c
        dissectors/packet-p7.c
        dissectors/packet-p772.c
        dissectors/packet-pcap.c
+       dissectors/packet-pcap_pktdata.c
        dissectors/packet-pkcs1.c
+       dissectors/packet-pkcs12.c
        dissectors/packet-pkinit.c
        dissectors/packet-pkix1explicit.c
        dissectors/packet-pkix1implicit.c
@@ -296,14 +301,11 @@ set(ASN1_DISSECTOR_SRC
 )
 
 set(DIRTY_ASN1_DISSECTOR_SRC
-       dissectors/packet-p1.c
-       dissectors/packet-pkcs12.c
        dissectors/packet-snmp.c
        dissectors/packet-tcap.c
 )
 
 set(DIRTY_CORBA_IDL_DISSECTOR_SRC
-       dissectors/packet-coseventcomm.c
        dissectors/packet-cosnaming.c
        dissectors/packet-gias.c
        dissectors/packet-parlay.c
@@ -311,11 +313,14 @@ set(DIRTY_CORBA_IDL_DISSECTOR_SRC
 )
 
 set(DISSECTOR_SRC
+       dissectors/file-btsnoop.c
        dissectors/file-elf.c
        dissectors/file-file.c
        dissectors/file-gif.c
        dissectors/file-jpeg.c
        dissectors/file-mp4.c
+       dissectors/file-pcap.c
+       dissectors/file-pcapng.c
        dissectors/file-png.c
        dissectors/packet-2dparityfec.c
        dissectors/packet-3com-njack.c
@@ -470,6 +475,7 @@ set(DISSECTOR_SRC
        dissectors/packet-cast.c
        dissectors/packet-catapult-dct2000.c
        dissectors/packet-cattp.c
+       dissectors/packet-cbor.c
        dissectors/packet-ccsds.c
        dissectors/packet-cdp.c
        dissectors/packet-cell_broadcast.c
@@ -486,6 +492,7 @@ set(DISSECTOR_SRC
        dissectors/packet-cipmotion.c
        dissectors/packet-cipsafety.c
        dissectors/packet-cisco-erspan.c
+       dissectors/packet-cisco-marker.c
        dissectors/packet-cisco-metadata.c
        dissectors/packet-cisco-oui.c
        dissectors/packet-cisco-sm.c
@@ -503,6 +510,7 @@ set(DISSECTOR_SRC
        dissectors/packet-cops.c
        dissectors/packet-corosync-totemnet.c
        dissectors/packet-corosync-totemsrp.c
+       dissectors/packet-coseventcomm.c
        dissectors/packet-cosine.c
        dissectors/packet-couchbase.c
        dissectors/packet-cp2179.c
@@ -872,6 +880,7 @@ set(DISSECTOR_SRC
        dissectors/packet-iscsi.c
        dissectors/packet-isdn.c
        dissectors/packet-iser.c
+       dissectors/packet-isi.c
        dissectors/packet-isis-clv.c
        dissectors/packet-isis-hello.c
        dissectors/packet-isis-lsp.c
@@ -881,6 +890,7 @@ set(DISSECTOR_SRC
        dissectors/packet-ismacryp.c
        dissectors/packet-ismp.c
        dissectors/packet-isns.c
+       dissectors/packet-iso14443.c
        dissectors/packet-iso7816.c
        dissectors/packet-isup.c
        dissectors/packet-itdm.c
@@ -1012,6 +1022,7 @@ set(DISSECTOR_SRC
        dissectors/packet-mq-pcf.c
        dissectors/packet-mq.c
        dissectors/packet-mqtt.c
+       dissectors/packet-mqtt-sn.c
        dissectors/packet-mrcpv2.c
        dissectors/packet-mrdisc.c
        dissectors/packet-mrp-mmrp.c
@@ -1025,6 +1036,7 @@ set(DISSECTOR_SRC
        dissectors/packet-msproxy.c
        dissectors/packet-msrp.c
        dissectors/packet-mstp.c
+       dissectors/packet-mswsp.c
        dissectors/packet-mtp2.c
        dissectors/packet-mtp3.c
        dissectors/packet-mtp3mg.c
@@ -1080,6 +1092,7 @@ set(DISSECTOR_SRC
        dissectors/packet-ntp.c
        dissectors/packet-null.c
        dissectors/packet-nwmtp.c
+       dissectors/packet-nwp.c
        dissectors/packet-oampdu.c
        dissectors/packet-ocfs2.c
        dissectors/packet-oicq.c
@@ -1200,6 +1213,7 @@ set(DISSECTOR_SRC
        dissectors/packet-roofnet.c
        dissectors/packet-rpc.c
        dissectors/packet-rpcap.c
+       dissectors/packet-rpcrdma.c
        dissectors/packet-rpki-rtr.c
        dissectors/packet-rpl.c
        dissectors/packet-rquota.c
@@ -1310,6 +1324,7 @@ set(DISSECTOR_SRC
        dissectors/packet-sync.c
        dissectors/packet-synergy.c
        dissectors/packet-synphasor.c
+       dissectors/packet-sysdig-event.c
        dissectors/packet-sysex.c
        dissectors/packet-syslog.c
        dissectors/packet-t30.c
@@ -1317,7 +1332,9 @@ set(DISSECTOR_SRC
        dissectors/packet-tali.c
        dissectors/packet-tapa.c
        dissectors/packet-tcp.c
+       dissectors/packet-tcpros.c
        dissectors/packet-tdmoe.c
+       dissectors/packet-tdmop.c
        dissectors/packet-tds.c
        dissectors/packet-teamspeak2.c
        dissectors/packet-teimanagement.c
@@ -1424,6 +1441,8 @@ set(DISSECTOR_SRC
        dissectors/packet-x29.c
        dissectors/packet-xcsl.c
        dissectors/packet-xdmcp.c
+       dissectors/packet-xip.c
+       dissectors/packet-xip-serval.c
        dissectors/packet-xmcp.c
        dissectors/packet-xml.c
        dissectors/packet-xmpp-conference.c
@@ -1581,7 +1600,6 @@ set(LIBWIRESHARK_FILES
        circuit.c
        column.c
        column-utils.c
-       color_dissector_filters.c
        conversation.c
        conversation_table.c
        crc10-tvb.c
@@ -1599,12 +1617,11 @@ set(LIBWIRESHARK_FILES
        except.c
        expert.c
        exported_pdu.c
-       ext_menubar.c
+       plugin_if.c
        filter_expressions.c
        follow.c
        frame_data.c
        frame_data_sequence.c
-       frequency-utils.c
        funnel.c
        g_int64_hash_routines.c
        gcp.c
@@ -1629,8 +1646,10 @@ set(LIBWIRESHARK_FILES
        reassemble.c
        reedsolomon.c
        req_resp_hdrs.c
+       rtd_table.c
        show_exception.c
        sminmpec.c
+       srt_table.c
        stat_tap_ui.c
        stats_tree.c
        strutil.c
@@ -1711,11 +1730,11 @@ set(CLEAN_FILES
        ${WSLUA_FILES}
 )
 
-if (WERROR)
+if (WERROR_COMMON_FLAGS)
        set_source_files_properties(
                ${CLEAN_FILES}
                PROPERTIES
-               COMPILE_FLAGS -Werror
+               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
        )
 endif()
 
@@ -1737,7 +1756,7 @@ add_library(epan ${LINK_MODE_LIB}
        ${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
-set(FULL_SO_VERSION "0.0.7")
+set(FULL_SO_VERSION "0.0.0")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -1751,7 +1770,7 @@ endif()
 
 ABICHECK(libwireshark)
 
-file(GLOB EPAN_HEADERS *.h)
+set(TOP_LEVEL_HEADERS ${CMAKE_BINARY_DIR}/config.h ${CMAKE_SOURCE_DIR}/color.h ${CMAKE_SOURCE_DIR}/register.h)
 file(GLOB CRYPT_HEADERS crypt/*.h)
 file(GLOB COMPRESS_HEADERS compress/*.h)
 file(GLOB DFILTER_HEADERS dfilter/*.h ../tools/lemon/cppmagic.h)
@@ -1759,28 +1778,27 @@ file(GLOB D_HEADERS dissectors/*.h)
 file(GLOB FTYPES_HEADERS ftypes/*.h)
 file(GLOB WMEM_HEADERS wmem/*.h)
 file(GLOB NGHTTP2_HEADERS nghttp2/*.h)
-file(MAKE_DIRECTORY ${ABICHECK_TMPDIR}
-       ${ABICHECK_TMPDIR}/epan
-       ${ABICHECK_TMPDIR}/crypt
-       ${ABICHECK_TMPDIR}/compress
-       ${ABICHECK_TMPDIR}/dfilter
-       ${ABICHECK_TMPDIR}/dissectors
-       ${ABICHECK_TMPDIR}/ftypes
-       ${ABICHECK_TMPDIR}/wmem
-       ${ABICHECK_TMPDIR}/nghttp2)
-
-file(COPY ../color.h ../register.h DESTINATION ${ABICHECK_TMPDIR})
-file(COPY ${HEADERS} DESTINATION ${ABICHECK_TMPDIR}/epan)
-file(COPY ${CRYPT_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/crypt)
-file(COPY ${COMPRESS_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/compress)
-file(COPY ${DFILTER_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/dfilter)
-file(COPY ${D_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/dissectors)
-file(COPY ${FTYPES_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/ftypes)
-file(COPY ${WMEM_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/wmem)
-file(COPY ${NGHTTP2_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/nghttp2)
 
 add_custom_command(OUTPUT libwireshark.abi.tar.gz
-       COMMAND cp ../config.h ${ABICHECK_TMPDIR}
+       COMMAND ${CMAKE_COMMAND} -E remove_directory ${ABICHECK_TMPDIR}
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/epan
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/crypt
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/compress
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/dfilter
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/dissectors
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/ftypes
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/wmem
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/nghttp2
+       COMMAND ${ABI_COPY_COMMAND} ${TOP_LEVEL_HEADERS} ${ABICHECK_TMPDIR} ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${ABICHECK_HEADERS} ${ABICHECK_TMPDIR}/epan ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${CRYPT_HEADERS} ${ABICHECK_TMPDIR}/crypt ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${COMPRESS_HEADERS} ${ABICHECK_TMPDIR}/compress ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${DFILTER_HEADERS} ${ABICHECK_TMPDIR}/dfilter ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${D_HEADERS} ${ABICHECK_TMPDIR}/dissectors ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${FTYPES_HEADERS} ${ABICHECK_TMPDIR}/ftypes ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${WMEM_HEADERS} ${ABICHECK_TMPDIR}/wmem ${ABI_COPY_FLAGS}
+       COMMAND ${ABI_COPY_COMMAND} ${NGHTTP2_HEADERS} ${ABICHECK_TMPDIR}/nghttp2 ${ABI_COPY_FLAGS}
        COMMAND rm -f ${ABICHECK_TMPDIR}/dissectors/x11-extension-implementation.h
                ${ABICHECK_TMPDIR}/dissectors/packet-rtps.h
                ${ABICHECK_TMPDIR}/dissectors/x11-glx-render-enum.h
@@ -1788,12 +1806,13 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz
                ${ABICHECK_TMPDIR}/dissectors/packet-idmp.h
        COMMAND ${ABICHECK_COMMAND}
        COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps/libwireshark/libwireshark_* ${CMAKE_CURRENT_BINARY_DIR}/libwireshark.abi.tar.gz
-       COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps ${ABICHECK_TMPDIR}/config.h
-               ${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/crypt/*
-               ${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/compress/*
-               ${ABICHECK_TMPDIR}/dfilter/* ${ABICHECK_TMPDIR}/dissectors/*
-               ${ABICHECK_TMPDIR}/ftypes/* ${ABICHECK_TMPDIR}/wmem/*
-               ${ABICHECK_TMPDIR}/nghttp2/*
+       COMMAND rm -rf ${ABICHECK_TMPDIR} ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps
+#      COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps ${ABICHECK_TMPDIR}/config.h
+#              ${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/crypt/*
+#              ${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/compress/*
+#              ${ABICHECK_TMPDIR}/dfilter/* ${ABICHECK_TMPDIR}/dissectors/*
+#              ${ABICHECK_TMPDIR}/ftypes/* ${ABICHECK_TMPDIR}/wmem/*
+#              ${ABICHECK_TMPDIR}/nghttp2/*
        DEPENDS ${HEADERS}
                ${CRYPT_HEADERS} ${COMPRESS_HEADERS} ${DFILTER_HEADERS} ${D_HEADERS}
                ${FTYPES_HEADERS} ${WMEM_HEADERS} ${NGHTTP2_HEADERS} epan)