git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
idl2wrs: 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 b502fd13fbc19dbafca38f965ff34fd6f1428f08..c32e85be9cd463e702d77661da9ecb5465df5fd8 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
@@ -249,11 +253,13 @@ 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-pkcs1.c
+       dissectors/packet-pkcs12.c
        dissectors/packet-pkinit.c
        dissectors/packet-pkix1explicit.c
        dissectors/packet-pkix1implicit.c
@@ -293,25 +299,19 @@ 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-parlay.c
-       dissectors/packet-tango.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
@@ -331,6 +331,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
@@ -390,6 +391,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
@@ -456,6 +458,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
@@ -463,6 +466,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
@@ -496,7 +500,9 @@ 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-cosnaming.c
        dissectors/packet-couchbase.c
        dissectors/packet-cp2179.c
        dissectors/packet-cpfi.c
@@ -704,6 +710,7 @@ set(DISSECTOR_SRC
        dissectors/packet-gearman.c
        dissectors/packet-ged125.c
        dissectors/packet-geneve.c
+       dissectors/packet-gias.c
        dissectors/packet-gift.c
        dissectors/packet-giop.c
        dissectors/packet-git.c
@@ -834,6 +841,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
@@ -1004,6 +1012,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
@@ -1017,6 +1026,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
@@ -1073,6 +1083,7 @@ set(DISSECTOR_SRC
        dissectors/packet-null.c
        dissectors/packet-nwmtp.c
        dissectors/packet-oampdu.c
+       dissectors/packet-ocfs2.c
        dissectors/packet-oicq.c
        dissectors/packet-oipf.c
        dissectors/packet-olsr.c
@@ -1101,6 +1112,7 @@ set(DISSECTOR_SRC
        dissectors/packet-pagp.c
        dissectors/packet-paltalk.c
        dissectors/packet-pana.c
+       dissectors/packet-parlay.c
        dissectors/packet-pcapng_block.c
        dissectors/packet-pcep.c
        dissectors/packet-pcli.c
@@ -1117,6 +1129,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
@@ -1190,6 +1203,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
@@ -1305,9 +1319,12 @@ set(DISSECTOR_SRC
        dissectors/packet-t30.c
        dissectors/packet-tacacs.c
        dissectors/packet-tali.c
+       dissectors/packet-tango.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
@@ -1318,6 +1335,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
@@ -1377,6 +1395,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
@@ -1412,6 +1431,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
@@ -1480,7 +1501,6 @@ 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}
 )
@@ -1587,11 +1607,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
@@ -1616,8 +1636,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
@@ -1724,7 +1746,7 @@ add_library(epan ${LINK_MODE_LIB}
        ${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
-set(FULL_SO_VERSION "0.0.3")
+set(FULL_SO_VERSION "0.0.10")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -1738,7 +1760,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)
@@ -1746,28 +1768,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
@@ -1775,12 +1796,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)
@@ -1805,34 +1827,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.