git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 bdc988ca534e510d92f2920271e9e0e78ace0f40..6635e75eced34104e7e08ddfe58d358ab5f92b44 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -31,7 +31,9 @@ endif()
 
 
 if (HAVE_LIBLUA)
-       include( wslua/CMakeLists.txt )
+       add_subdirectory( wslua )
+       WSLUA_GENERATE_TAP_SRC()
+       WSLUA_GENERATE_REG_SRC()
 endif()
 source_group(wslua FILES ${WSLUA_FILES})
 
@@ -43,6 +45,7 @@ include_directories(
        ${CMAKE_CURRENT_SOURCE_DIR}/dissectors
        ${CMAKE_CURRENT_SOURCE_DIR}/ftypes
        ${CMAKE_CURRENT_SOURCE_DIR}/wslua
+       ${CMAKE_CURRENT_BINARY_DIR}/wslua
        ${CMAKE_CURRENT_SOURCE_DIR}/nghttp2
 )
 
@@ -73,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
@@ -187,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
 )
@@ -196,6 +201,9 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-acp133.c
        dissectors/packet-acse.c
        dissectors/packet-ansi_tcap.c
+       dissectors/packet-atn-ulcs.c
+       dissectors/packet-atn-cm.c
+       dissectors/packet-atn-cpdlc.c
        dissectors/packet-c1222.c
        dissectors/packet-camel.c
        dissectors/packet-cdt.c
@@ -212,6 +220,7 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-ess.c
        dissectors/packet-ftam.c
        dissectors/packet-goose.c
+       dissectors/packet-gsm_map.c
        dissectors/packet-HI2Operations.c
        dissectors/packet-h225.c
        dissectors/packet-h235.c
@@ -231,11 +240,13 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-isdn-sup.c
        dissectors/packet-kerberos.c
        dissectors/packet-lcsap.c
+       dissectors/packet-ldap.c
        dissectors/packet-logotypecertextn.c
        dissectors/packet-lpp.c
        dissectors/packet-lppa.c
        dissectors/packet-lppe.c
        dissectors/packet-lte-rrc.c
+       dissectors/packet-m3ap.c
        dissectors/packet-mms.c
        dissectors/packet-mpeg-audio.c
        dissectors/packet-mpeg-pes.c
@@ -243,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
@@ -256,10 +270,12 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-pkixqualified.c
        dissectors/packet-pkixtsp.c
        dissectors/packet-pktap.c
+       dissectors/packet-pres.c
        dissectors/packet-q932.c
        dissectors/packet-q932-ros.c
        dissectors/packet-qsig.c
        dissectors/packet-ranap.c
+       dissectors/packet-rnsap.c
        dissectors/packet-ros.c
        dissectors/packet-rrc.c
        dissectors/packet-rrlp.c
@@ -271,7 +287,10 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-smrse.c
        dissectors/packet-spnego.c
        dissectors/packet-sv.c
+       dissectors/packet-t124.c
+       dissectors/packet-t125.c
        dissectors/packet-t38.c
+       dissectors/packet-tetra.c
        dissectors/packet-ulp.c
        dissectors/packet-wlancertextn.c
        dissectors/packet-x2ap.c
@@ -282,30 +301,26 @@ set(ASN1_DISSECTOR_SRC
 )
 
 set(DIRTY_ASN1_DISSECTOR_SRC
-       dissectors/packet-coseventcomm.c
+       dissectors/packet-snmp.c
+       dissectors/packet-tcap.c
+)
+
+set(DIRTY_CORBA_IDL_DISSECTOR_SRC
        dissectors/packet-cosnaming.c
-       dissectors/packet-gsm_map.c
-       dissectors/packet-ldap.c
-       dissectors/packet-m3ap.c
-       dissectors/packet-p1.c
+       dissectors/packet-gias.c
        dissectors/packet-parlay.c
-       dissectors/packet-pkcs12.c
-       dissectors/packet-pres.c
-       dissectors/packet-rnsap.c
-       dissectors/packet-snmp.c
-       dissectors/packet-t124.c
-       dissectors/packet-t125.c
        dissectors/packet-tango.c
-       dissectors/packet-tcap.c
-       dissectors/packet-tetra.c
 )
 
 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
@@ -325,6 +340,7 @@ set(DISSECTOR_SRC
        dissectors/packet-adb_service.c
        dissectors/packet-adwin-config.c
        dissectors/packet-adwin.c
+       dissectors/packet-aeron.c
        dissectors/packet-afp.c
        dissectors/packet-afs.c
        dissectors/packet-agentx.c
@@ -384,6 +400,7 @@ set(DISSECTOR_SRC
        dissectors/packet-asterix.c
        dissectors/packet-at.c
        dissectors/packet-atalk.c
+       dissectors/packet-ath.c
        dissectors/packet-atm.c
        dissectors/packet-atmtcp.c
        dissectors/packet-auto_rp.c
@@ -410,6 +427,7 @@ set(DISSECTOR_SRC
        dissectors/packet-bjnp.c
        dissectors/packet-bluetooth.c
        dissectors/packet-bmc.c
+       dissectors/packet-bmp.c
        dissectors/packet-bofl.c
        dissectors/packet-bootp.c
        dissectors/packet-bootparams.c
@@ -449,6 +467,7 @@ set(DISSECTOR_SRC
        dissectors/packet-bt-oui.c
        dissectors/packet-bvlc.c
        dissectors/packet-bzr.c
+       dissectors/packet-c15ch.c
        dissectors/packet-calcappprotocol.c
        dissectors/packet-canopen.c
        dissectors/packet-capwap.c
@@ -456,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
@@ -472,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
@@ -489,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
@@ -827,6 +849,7 @@ set(DISSECTOR_SRC
        dissectors/packet-ip.c
        dissectors/packet-ipars.c
        dissectors/packet-ipdc.c
+       dissectors/packet-ipdr.c
        dissectors/packet-ipfc.c
        dissectors/packet-ipmi.c
        dissectors/packet-ipmi-app.c
@@ -857,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
@@ -866,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
@@ -997,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
@@ -1010,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
@@ -1023,7 +1050,7 @@ set(DISSECTOR_SRC
        dissectors/packet-nb_rtpmux.c
        dissectors/packet-nbd.c
        dissectors/packet-nbipx.c
-       dissectors/packet-nbns.c
+       dissectors/packet-nbt.c
        dissectors/packet-ncp-nmas.c
        dissectors/packet-ncp-sss.c
        dissectors/packet-ncp.c
@@ -1065,7 +1092,9 @@ 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
        dissectors/packet-oipf.c
        dissectors/packet-olsr.c
@@ -1110,6 +1139,7 @@ set(DISSECTOR_SRC
        dissectors/packet-pingpongprotocol.c
        dissectors/packet-pktc.c
        dissectors/packet-pktgen.c
+       dissectors/packet-pmproxy.c
        dissectors/packet-pnrp.c
        dissectors/packet-pop.c
        dissectors/packet-portmap.c
@@ -1183,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
@@ -1280,6 +1311,7 @@ set(DISSECTOR_SRC
        dissectors/packet-ssh.c
        dissectors/packet-ssl-utils.c
        dissectors/packet-ssl.c
+       dissectors/packet-sstp.c
        dissectors/packet-stanag4607.c
        dissectors/packet-starteam.c
        dissectors/packet-stat-notify.c
@@ -1292,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
@@ -1299,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
@@ -1310,6 +1345,7 @@ set(DISSECTOR_SRC
        dissectors/packet-text-media.c
        dissectors/packet-tfp.c
        dissectors/packet-tftp.c
+       dissectors/packet-thrift.c
        dissectors/packet-time.c
        dissectors/packet-tipc.c
        dissectors/packet-tivoconnect.c
@@ -1369,6 +1405,7 @@ set(DISSECTOR_SRC
        dissectors/packet-vp8.c
        dissectors/packet-vrrp.c
        dissectors/packet-vrt.c
+       dissectors/packet-vsip.c
        dissectors/packet-vssmonitoring.c
        dissectors/packet-vtp.c
        dissectors/packet-vuze-dht.c
@@ -1404,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
@@ -1472,6 +1511,7 @@ set(DISSECTOR_FILES
        ${PIDL_DISSECTOR_AUTOGEN_SRC}
        ${ASN1_DISSECTOR_SRC}
        ${DIRTY_ASN1_DISSECTOR_SRC}
+       ${DIRTY_CORBA_IDL_DISSECTOR_SRC}
        ${CUSTOM_DISSECTOR_SRC}
        ${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
 )
@@ -1517,11 +1557,6 @@ set(WMEM_FILES
 )
 source_group(wmem FILES ${WMEM_FILES})
 
-set(JSMN_FILES
-       jsmn/jsmn.c
-)
-source_group(jsmn FILES ${JSMN_FILES})
-
 set(NGHTTP2_FILES
        nghttp2/nghttp2_buf.c
        nghttp2/nghttp2_hd.c
@@ -1565,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
@@ -1583,11 +1617,11 @@ set(LIBWIRESHARK_FILES
        except.c
        expert.c
        exported_pdu.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
@@ -1612,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
@@ -1690,16 +1726,15 @@ set(CLEAN_FILES
        ${DISSECTOR_SUPPORT_SRC}
        ${LIBWIRESHARK_ASM_FILES}
        ${WMEM_FILES}
-       ${JSMN_FILES}
        ${NGHTTP2_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()
 
@@ -1713,7 +1748,6 @@ add_library(epan ${LINK_MODE_LIB}
        ${DFILTER_FILES}
        ${FTYPE_FILES}
        ${WMEM_FILES}
-       ${JSMN_FILES}
        ${NGHTTP2_FILES}
        ${WSLUA_FILES}
        ${DISSECTOR_FILES}
@@ -1736,39 +1770,35 @@ 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)
 file(GLOB D_HEADERS dissectors/*.h)
 file(GLOB FTYPES_HEADERS ftypes/*.h)
 file(GLOB WMEM_HEADERS wmem/*.h)
-file(GLOB JSMN_HEADERS jsmn/*.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}/jsmn
-       ${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 ${JSMN_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/jsmn)
-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
@@ -1776,15 +1806,16 @@ 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}/jsmn/* ${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} ${JSMN_HEADERS} ${NGHTTP2_HEADERS} epan)
+               ${FTYPES_HEADERS} ${WMEM_HEADERS} ${NGHTTP2_HEADERS} epan)
 
 # By default the name for a library with target name epan will be libepan,
 # but Ethereal is now named Wireshark
@@ -1806,34 +1837,34 @@ if(NOT ${ENABLE_STATIC})
        )
 endif()
 
-add_executable(wmem_test wmem/wmem_test.c ${WMEM_FILES})
+add_executable(wmem_test EXCLUDE_FROM_ALL wmem/wmem_test.c ${WMEM_FILES})
 target_link_libraries(wmem_test ${GLIB2_LIBRARIES})
 set_target_properties(wmem_test PROPERTIES
        FOLDER "Tests"
        COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
-add_executable(exntest exntest.c except.c)
+add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c)
 target_link_libraries(exntest ${GLIB2_LIBRARIES})
 set_target_properties(exntest PROPERTIES
        FOLDER "Tests"
        COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
-add_executable(oids_test oids_test.c)
-target_link_libraries(oids_test epan)
+add_executable(oids_test EXCLUDE_FROM_ALL oids_test.c)
+target_link_libraries(oids_test epan ${ZLIB_LIBRARIES})
 set_target_properties(oids_test PROPERTIES
        FOLDER "Tests"
        COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
-add_executable(reassemble_test reassemble_test.c)
+add_executable(reassemble_test EXCLUDE_FROM_ALL reassemble_test.c)
 target_link_libraries(reassemble_test epan)
 set_target_properties(reassemble_test PROPERTIES
        FOLDER "Tests"
 )
 
-add_executable(tvbtest tvbtest.c)
+add_executable(tvbtest EXCLUDE_FROM_ALL tvbtest.c)
 target_link_libraries(tvbtest epan)
 set_target_properties(tvbtest PROPERTIES
        FOLDER "Tests"
Unnamed repository; edit this file to name it for gitweb.