git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
1.99.6 → 1.99.7.
[metze/wireshark/wip.git] / epan / CMakeLists.txt
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 3998a7a49786add1e9ee5dd17cac96f200eb7306..16e8148b9e325ab4b08bfd78eed0829075dd3083 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -21,6 +21,8 @@
 
 include(UseABICheck)
 
+ADD_CUSTOM_CMAKE_INCLUDE()
+
 if (HAVE_HFI_SECTION_INIT)
        add_definitions(
                -DHAVE_HFI_SECTION_INIT
@@ -29,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})
 
@@ -41,15 +45,22 @@ 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
 )
 
+set(COMPRESS_FILES
+       compress/lzxpress.c
+)
+source_group(compress FILES ${COMPRESS_FILES})
+
 set(CRYPT_FILES
        crypt/airpdcap.c
        crypt/airpdcap_ccmp.c
        crypt/airpdcap_debug.c
        crypt/airpdcap_rijndael.c
        crypt/airpdcap_tkip.c
+       ${CUSTOM_CRYPT_SRC}
 )
 source_group(crypt FILES ${CRYPT_FILES})
 
@@ -84,78 +95,78 @@ add_lemon_files(DFILTER_FILES
 )
 
 if (AUTOGEN_pidl)
-    # TODO
+       # TODO
 endif()
 
 if (AUTOGEN_dcerpc)
-  FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
-    set(PIDL_DISSECTOR_AUTOGEN_SRC
-       ${PIDL_DISSECTOR_AUTOGEN_SRC}
-       dissectors/dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}.c
-    )
-  ENDFOREACH()
+       FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
+               set(PIDL_DISSECTOR_AUTOGEN_SRC
+               ${PIDL_DISSECTOR_AUTOGEN_SRC}
+               dissectors/dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}.c
+       )
+       ENDFOREACH()
 
-  FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
-    SET(CUR_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dissectors/dcerpc/${PROTOCOL_NAME})
-    SET(CUR_PROTO_C_FILE packet-dcerpc-${PROTOCOL_NAME}.c)
-    SET(CUR_PROTO_H_FILE packet-dcerpc-${PROTOCOL_NAME}.h)
-    ADD_CUSTOM_COMMAND(
-       OUTPUT
-         ${CUR_PROTO_DIR}/${CUR_PROTO_C_FILE}
-         ${CUR_PROTO_DIR}/${CUR_PROTO_H_FILE}
-       COMMAND
-         idl2wrs ${PROTOCOL_NAME}
-       COMMAND
-         ${CMAKE_COMMAND} -E copy_if_different ${CUR_PROTO_DIR}/${CUR_PROTO_C_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/dissectors/${CUR_PROTO_C_FILE}
-       COMMAND
-         ${CMAKE_COMMAND} -E copy_if_different ${CUR_PROTO_DIR}/${CUR_PROTO_H_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/dissectors/${CUR_PROTO_H_FILE}
-       WORKING_DIRECTORY
-         ${CUR_PROTO_DIR}
-       DEPENDS
-         ${CUR_PROTO_DIR}/${PROTOCOL_NAME}.idl
-         ${CUR_PROTO_DIR}/${PROTOCOL_NAME}.cnf
-         ${CUR_PROTO_DIR}/packet-dcerpc-${PROTOCOL_NAME}-template.c
-         ${CUR_PROTO_DIR}/packet-dcerpc-${PROTOCOL_NAME}-template.h
-    )
-  ENDFOREACH()
+       FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
+               SET(CUR_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dissectors/dcerpc/${PROTOCOL_NAME})
+               SET(CUR_PROTO_C_FILE packet-dcerpc-${PROTOCOL_NAME}.c)
+               SET(CUR_PROTO_H_FILE packet-dcerpc-${PROTOCOL_NAME}.h)
+               ADD_CUSTOM_COMMAND(
+                       OUTPUT
+                       ${CUR_PROTO_DIR}/${CUR_PROTO_C_FILE}
+                       ${CUR_PROTO_DIR}/${CUR_PROTO_H_FILE}
+                       COMMAND
+                               idl2wrs ${PROTOCOL_NAME}
+                       COMMAND
+                               ${CMAKE_COMMAND} -E copy_if_different ${CUR_PROTO_DIR}/${CUR_PROTO_C_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/dissectors/${CUR_PROTO_C_FILE}
+                       COMMAND
+                               ${CMAKE_COMMAND} -E copy_if_different ${CUR_PROTO_DIR}/${CUR_PROTO_H_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/dissectors/${CUR_PROTO_H_FILE}
+                       WORKING_DIRECTORY
+                               ${CUR_PROTO_DIR}
+                       DEPENDS
+                               ${CUR_PROTO_DIR}/${PROTOCOL_NAME}.idl
+                               ${CUR_PROTO_DIR}/${PROTOCOL_NAME}.cnf
+                               ${CUR_PROTO_DIR}/packet-dcerpc-${PROTOCOL_NAME}-template.c
+                               ${CUR_PROTO_DIR}/packet-dcerpc-${PROTOCOL_NAME}-template.h
+               )
+       ENDFOREACH()
 else()
-  FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
-    set(PIDL_DISSECTOR_AUTOGEN_SRC
-       ${PIDL_DISSECTOR_AUTOGEN_SRC}
-       dissectors/packet-dcerpc-${PROTOCOL_NAME}.c
-    )
-  ENDFOREACH()
+       FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
+               set(PIDL_DISSECTOR_AUTOGEN_SRC
+               ${PIDL_DISSECTOR_AUTOGEN_SRC}
+               dissectors/packet-dcerpc-${PROTOCOL_NAME}.c
+               )
+       ENDFOREACH()
 endif()
 
 ADD_CUSTOM_COMMAND(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/ncp2222.py
-      -o ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
-    DEPENDS
-      dissectors/packet-ncp2222.inc
-      ${CMAKE_SOURCE_DIR}/tools/ncp2222.py
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
+       COMMAND ${PYTHON_EXECUTABLE}
+               ${CMAKE_SOURCE_DIR}/tools/ncp2222.py
+               -o ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
+       DEPENDS
+               dissectors/packet-ncp2222.inc
+               ${CMAKE_SOURCE_DIR}/tools/ncp2222.py
 )
 
 ADD_CUSTOM_COMMAND(
-    OUTPUT
-       x11-dissector
-#      x11-declarations.h
-#      x11-enum.h
-#      x11-extension-errors.h
-#      x11-extension-implementation.h
-#      x11-fields
-#      x11-glx-render-enum.h
-#      x11-register-info.h
-    COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
-      <dissectors/x11-fields
-    COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
-    DEPENDS
-      dissectors/x11-fields
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
-      ${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
+       OUTPUT
+               x11-dissector
+#              x11-declarations.h
+#              x11-enum.h
+#              x11-extension-errors.h
+#              x11-extension-implementation.h
+#              x11-fields
+#              x11-glx-render-enum.h
+#              x11-register-info.h
+       COMMAND ${PERL_EXECUTABLE}
+               ${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
+               <dissectors/x11-fields
+       COMMAND ${PERL_EXECUTABLE}
+               ${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
+       DEPENDS
+               dissectors/x11-fields
+               ${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
+               ${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl
 )
 
 # Note that some dissectors are added in dissectors/dcerpc/CMakeLists.txt
@@ -164,30 +175,33 @@ set(PIDL_DISSECTOR_SRC
 #      dissectors/packet-dcerpc-budb.c
 #      dissectors/packet-dcerpc-butc.c
 #      dissectors/packet-dcerpc-drsuapi.c
+       dissectors/packet-dcerpc-dfs.c
+       dissectors/packet-dcerpc-dnsserver.c
        dissectors/packet-dcerpc-dssetup.c
        dissectors/packet-dcerpc-efs.c
+       dissectors/packet-dcerpc-eventlog.c
        dissectors/packet-dcerpc-frstrans.c
        dissectors/packet-dcerpc-initshutdown.c
+       dissectors/packet-dcerpc-lsa.c
        dissectors/packet-dcerpc-nspi.c
+       dissectors/packet-dcerpc-mdssvc.c
+       dissectors/packet-dcerpc-misc.c
+       dissectors/packet-dcerpc-mapi.c
        dissectors/packet-dcerpc-rfr.c
        dissectors/packet-dcerpc-srvsvc.c
+       dissectors/packet-dcerpc-winreg.c
        dissectors/packet-dcerpc-wkssvc.c
        dissectors/packet-dcerpc-wzcsvc.c
 )
-set(DIRTY_PIDL_DISSECTOR_SRC
-       dissectors/packet-dcerpc-dfs.c
-       dissectors/packet-dcerpc-dnsserver.c
-       dissectors/packet-dcerpc-eventlog.c
-       dissectors/packet-dcerpc-lsa.c
-       dissectors/packet-dcerpc-mapi.c
-       dissectors/packet-dcerpc-mdssvc.c
-       dissectors/packet-dcerpc-misc.c
-       dissectors/packet-dcerpc-winreg.c
-)
+
 set(ASN1_DISSECTOR_SRC
+       dissectors/packet-ansi_map.c
        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
@@ -204,6 +218,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
@@ -223,11 +238,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
@@ -248,10 +265,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
@@ -263,7 +282,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
@@ -274,24 +296,18 @@ set(ASN1_DISSECTOR_SRC
 )
 
 set(DIRTY_ASN1_DISSECTOR_SRC
-       dissectors/packet-ansi_map.c
-       dissectors/packet-coseventcomm.c
-       dissectors/packet-cosnaming.c
-       dissectors/packet-gprscdr.c
-       dissectors/packet-gsm_map.c
-       dissectors/packet-ldap.c
-       dissectors/packet-m3ap.c
        dissectors/packet-p1.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(DIRTY_CORBA_IDL_DISSECTOR_SRC
+       dissectors/packet-coseventcomm.c
+       dissectors/packet-cosnaming.c
+       dissectors/packet-gias.c
+       dissectors/packet-parlay.c
+       dissectors/packet-tango.c
 )
 
 set(DISSECTOR_SRC
@@ -314,7 +330,9 @@ set(DISSECTOR_SRC
        dissectors/packet-acn.c
        dissectors/packet-acr122.c
        dissectors/packet-actrace.c
+       dissectors/packet-adb.c
        dissectors/packet-adb_cs.c
+       dissectors/packet-adb_service.c
        dissectors/packet-adwin-config.c
        dissectors/packet-adwin.c
        dissectors/packet-afp.c
@@ -376,6 +394,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
@@ -400,7 +419,9 @@ set(DISSECTOR_SRC
        dissectors/packet-bitcoin.c
        dissectors/packet-bittorrent.c
        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
@@ -423,6 +444,7 @@ set(DISSECTOR_SRC
        dissectors/packet-bthci_cmd.c
        dissectors/packet-bthci_evt.c
        dissectors/packet-bthci_sco.c
+       dissectors/packet-bthci_vendor.c
        dissectors/packet-bthcrp.c
        dissectors/packet-bthfp.c
        dissectors/packet-bthid.c
@@ -439,15 +461,18 @@ 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
        dissectors/packet-carp.c
        dissectors/packet-cast.c
        dissectors/packet-catapult-dct2000.c
+       dissectors/packet-cattp.c
        dissectors/packet-ccsds.c
        dissectors/packet-cdp.c
        dissectors/packet-cell_broadcast.c
+       dissectors/packet-ceph.c
        dissectors/packet-cfdp.c
        dissectors/packet-cfm.c
        dissectors/packet-cgmp.c
@@ -478,6 +503,8 @@ set(DISSECTOR_SRC
        dissectors/packet-corosync-totemnet.c
        dissectors/packet-corosync-totemsrp.c
        dissectors/packet-cosine.c
+       dissectors/packet-couchbase.c
+       dissectors/packet-cp2179.c
        dissectors/packet-cpfi.c
        dissectors/packet-cpha.c
        dissectors/packet-csm-encaps.c
@@ -568,6 +595,7 @@ set(DISSECTOR_SRC
        dissectors/packet-diffserv-mpls-common.c
        dissectors/packet-dis.c
        dissectors/packet-distcc.c
+       dissectors/packet-dji-uav.c
        dissectors/packet-dlm3.c
        dissectors/packet-dlsw.c
        dissectors/packet-dmp.c
@@ -583,6 +611,7 @@ set(DISSECTOR_SRC
        dissectors/packet-dpnss.c
        dissectors/packet-drda.c
        dissectors/packet-dsi.c
+       dissectors/packet-dsr.c
        dissectors/packet-dtcp-ip.c
        dissectors/packet-dtls.c
        dissectors/packet-dtn.c
@@ -614,6 +643,7 @@ set(DISSECTOR_SRC
        dissectors/packet-ehs.c
        dissectors/packet-eigrp.c
        dissectors/packet-eiss.c
+       dissectors/packet-elasticsearch.c
        dissectors/packet-elcom.c
        dissectors/packet-elmi.c
        dissectors/packet-enc.c
@@ -700,8 +730,10 @@ set(DISSECTOR_SRC
        dissectors/packet-gopher.c
        dissectors/packet-gpef.c
        dissectors/packet-gprs-llc.c
+       dissectors/packet-gprscdr.c
        dissectors/packet-gre.c
        dissectors/packet-gsm_a_bssmap.c
+       dissectors/packet-gsm_a_common.c
        dissectors/packet-gsm_a_dtap.c
        dissectors/packet-gsm_a_gm.c
        dissectors/packet-gsm_a_rp.c
@@ -723,6 +755,7 @@ set(DISSECTOR_SRC
        dissectors/packet-gtpv2.c
        dissectors/packet-gvcp.c
        dissectors/packet-gvrp.c
+       dissectors/packet-gvsp.c
        dissectors/packet-h1.c
        dissectors/packet-h221_nonstd.c
        dissectors/packet-h223.c
@@ -744,12 +777,14 @@ set(DISSECTOR_SRC
        dissectors/packet-hci_mon.c
        dissectors/packet-hci_usb.c
        dissectors/packet-hclnfsd.c
+       dissectors/packet-hcrt.c
        dissectors/packet-hdcp.c
        dissectors/packet-hdcp2.c
        dissectors/packet-hdfs.c
        dissectors/packet-hdfsdata.c
        dissectors/packet-hdmi.c
        dissectors/packet-hip.c
+       dissectors/packet-hiqnet.c
        dissectors/packet-hislip.c
        dissectors/packet-homeplug-av.c
        dissectors/packet-homeplug.c
@@ -805,6 +840,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
@@ -870,6 +906,7 @@ set(DISSECTOR_SRC
        dissectors/packet-kismet.c
        dissectors/packet-klm.c
        dissectors/packet-knet.c
+       dissectors/packet-knxnetip.c
        dissectors/packet-kpasswd.c
        dissectors/packet-kt.c
        dissectors/packet-l1-events.c
@@ -897,6 +934,7 @@ set(DISSECTOR_SRC
        dissectors/packet-link16.c
        dissectors/packet-linx.c
        dissectors/packet-lisp-data.c
+       dissectors/packet-lisp-tcp.c
        dissectors/packet-lisp.c
        dissectors/packet-llc.c
        dissectors/packet-lldp.c
@@ -906,6 +944,7 @@ set(DISSECTOR_SRC
        dissectors/packet-lmi.c
        dissectors/packet-lmp.c
        dissectors/packet-logcat.c
+       dissectors/packet-logcat-text.c
        dissectors/packet-lon.c
        dissectors/packet-loop.c
        dissectors/packet-lpd.c
@@ -929,6 +968,7 @@ set(DISSECTOR_SRC
        dissectors/packet-mausb.c
        dissectors/packet-mbim.c
        dissectors/packet-mbtcp.c
+       dissectors/packet-mcpe.c
        dissectors/packet-mdshdr.c
        dissectors/packet-media.c
        dissectors/packet-megaco.c
@@ -944,6 +984,7 @@ set(DISSECTOR_SRC
        dissectors/packet-miop.c
        dissectors/packet-mip.c
        dissectors/packet-mip6.c
+       dissectors/packet-mka.c
        dissectors/packet-mmse.c
        dissectors/packet-mndp.c
        dissectors/packet-mojito.c
@@ -996,7 +1037,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
@@ -1039,6 +1080,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
@@ -1052,7 +1094,7 @@ set(DISSECTOR_SRC
        dissectors/packet-openvpn.c
        dissectors/packet-openwire.c
        dissectors/packet-opsi.c
-    dissectors/packet-optommp.c
+       dissectors/packet-optommp.c
        dissectors/packet-osc.c
        dissectors/packet-osi-options.c
        dissectors/packet-osi.c
@@ -1114,6 +1156,7 @@ set(DISSECTOR_SRC
        dissectors/packet-q931.c
        dissectors/packet-q933.c
        dissectors/packet-qllc.c
+       dissectors/packet-qnet6.c
        dissectors/packet-quake.c
        dissectors/packet-quake2.c
        dissectors/packet-quake3.c
@@ -1121,6 +1164,7 @@ set(DISSECTOR_SRC
        dissectors/packet-quic.c
        dissectors/packet-radius.c
        dissectors/packet-radius_packetcable.c
+       dissectors/packet-raknet.c
        dissectors/packet-raw.c
        dissectors/packet-rdm.c
        dissectors/packet-rdp.c
@@ -1136,6 +1180,7 @@ set(DISSECTOR_SRC
        dissectors/packet-rfid-pn532.c
        dissectors/packet-rfid-pn532-hci.c
        dissectors/packet-rgmp.c
+       dissectors/packet-riemann.c
        dissectors/packet-rip.c
        dissectors/packet-ripng.c
        dissectors/packet-rlc-lte.c
@@ -1160,6 +1205,7 @@ set(DISSECTOR_SRC
        dissectors/packet-rsip.c
        dissectors/packet-rsl.c
        dissectors/packet-rstat.c
+       dissectors/packet-rsvd.c
        dissectors/packet-rsvp.c
        dissectors/packet-rsync.c
        dissectors/packet-rtacser.c
@@ -1178,6 +1224,8 @@ set(DISSECTOR_SRC
        dissectors/packet-rx.c
        dissectors/packet-s5066sis.c
        dissectors/packet-s5066dts.c
+       dissectors/packet-s7comm.c
+       dissectors/packet-s7comm_szl_ids.c
        dissectors/packet-sadmind.c
        dissectors/packet-sametime.c
        dissectors/packet-sap.c
@@ -1224,6 +1272,7 @@ set(DISSECTOR_SRC
        dissectors/packet-smb-direct.c
        dissectors/packet-smb.c
        dissectors/packet-smb2.c
+       dissectors/packet-smcr.c
        dissectors/packet-sml.c
        dissectors/packet-smpp.c
        dissectors/packet-smtp.c
@@ -1246,10 +1295,12 @@ 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
        dissectors/packet-stat.c
+       dissectors/packet-stt.c
        dissectors/packet-stun.c
        dissectors/packet-sua.c
        dissectors/packet-swipe.c
@@ -1275,6 +1326,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
@@ -1334,6 +1386,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
@@ -1363,6 +1416,7 @@ set(DISSECTOR_SRC
        dissectors/packet-wsp.c
        dissectors/packet-wtls.c
        dissectors/packet-wtp.c
+       dissectors/packet-x11.c
        dissectors/packet-x224.c
        dissectors/packet-x25.c
        dissectors/packet-x29.c
@@ -1395,6 +1449,7 @@ set(DISSECTOR_SRC
        dissectors/packet-zbee-zcl-general.c
        dissectors/packet-zbee-zcl-ha.c
        dissectors/packet-zbee-zcl-meas-sensing.c
+       dissectors/packet-zbee-zcl-misc.c
        dissectors/packet-zbee-zcl-se.c
        dissectors/packet-zbee-zdp-binding.c
        dissectors/packet-zbee-zdp-discovery.c
@@ -1404,11 +1459,7 @@ set(DISSECTOR_SRC
        dissectors/packet-zep.c
        dissectors/packet-ziop.c
        dissectors/packet-zrtp.c
-)
-
-set(DIRTY_DISSECTOR_SRC
-       dissectors/packet-gsm_a_common.c
-       dissectors/packet-x11.c
+       dissectors/packet-zvt.c
 )
 
 set(DISSECTOR_SUPPORT_SRC
@@ -1435,12 +1486,13 @@ set(LIBWIRESHARK_ASM_FILES
 
 set(DISSECTOR_FILES
        ${DISSECTOR_SRC}
-       ${DIRTY_DISSECTOR_SRC}
        ${PIDL_DISSECTOR_SRC}
        ${PIDL_DISSECTOR_AUTOGEN_SRC}
-       ${DIRTY_PIDL_DISSECTOR_SRC}
        ${ASN1_DISSECTOR_SRC}
        ${DIRTY_ASN1_DISSECTOR_SRC}
+       ${DIRTY_CORBA_IDL_DISSECTOR_SRC}
+       ${CUSTOM_DISSECTOR_SRC}
+       ${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
 )
 source_group(dissectors FILES ${DISSECTOR_FILES})
 
@@ -1490,17 +1542,19 @@ set(NGHTTP2_FILES
        nghttp2/nghttp2_hd_huffman.c
        nghttp2/nghttp2_hd_huffman_data.c
        nghttp2/nghttp2_helper.c
+       nghttp2/nghttp2_mem.c
 )
 source_group(nghttp2 FILES ${NGHTTP2_FILES})
 
 ADD_CUSTOM_TARGET(
-    update-sminmpec
-    COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
-    DEPENDS
-      enterprise-numbers
-      ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
+       update-sminmpec
+       COMMAND ${PERL_EXECUTABLE}
+               ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
+       DEPENDS
+               enterprise-numbers
+               ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
 )
+set_target_properties(update-sminmpec PROPERTIES FOLDER "tools")
 
 ADD_CUSTOM_COMMAND(
        OUTPUT  ps.c
@@ -1516,42 +1570,45 @@ ADD_CUSTOM_COMMAND(
 set(LIBWIRESHARK_FILES
        addr_and_mask.c
        addr_resolv.c
-       address_to_str.c
+       address_types.c
        afn.c
        aftypes.c
        app_mem_usage.c
        asn1.c
-       atalk-utils.c
        charsets.c
        circuit.c
        column.c
        column-utils.c
+       color_dissector_filters.c
        conversation.c
+       conversation_table.c
+       crc10-tvb.c
        crc16-tvb.c
        crc32-tvb.c
+       crc6-tvb.c
        crc8-tvb.c
        decode_as.c
        disabled_protos.c
        dissector_filters.c
        dvb_chartbl.c
        dwarf.c
-       emem.c
        epan.c
        ex-opt.c
        except.c
        expert.c
        exported_pdu.c
+       ext_menubar.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
        geoip_db.c
        golay.c
        guid-utils.c
-       h225-persistentdata.c
        in_cksum.c
        ipproto.c
        ipv4.c
@@ -1562,6 +1619,7 @@ set(LIBWIRESHARK_FILES
        packet-range.c
        packet.c
        print.c
+       print_stream.c
        prefs.c
        proto.c
        ps.c
@@ -1570,11 +1628,8 @@ set(LIBWIRESHARK_FILES
        reedsolomon.c
        req_resp_hdrs.c
        show_exception.c
-       sigcomp_state_hdlr.c
-       sigcomp-udvm.c
        sminmpec.c
-       sna-utils.c
-       stat_cmd_args.c
+       stat_tap_ui.c
        stats_tree.c
        strutil.c
        stream.c
@@ -1638,6 +1693,7 @@ set(CLEAN_FILES
        #x11-declarations.h
        #x11-register-info.h
        ${LIBWIRESHARK_CLEAN_FILES}
+       ${COMPRESS_FILES}
        ${CRYPT_FILES}
        ${DFILTER_CLEAN_FILES}
        ${FTYPE_FILES}
@@ -1654,11 +1710,11 @@ set(CLEAN_FILES
 )
 
 if (WERROR)
-    set_source_files_properties(
-       ${CLEAN_FILES}
-       PROPERTIES
-       COMPILE_FLAGS -Werror
-    )
+       set_source_files_properties(
+               ${CLEAN_FILES}
+               PROPERTIES
+               COMPILE_FLAGS -Werror
+       )
 endif()
 
 add_library(epan ${LINK_MODE_LIB}
@@ -1667,6 +1723,7 @@ add_library(epan ${LINK_MODE_LIB}
        #x11-register-info.h
        ${LIBWIRESHARK_FILES}
        ${CRYPT_FILES}
+       ${COMPRESS_FILES}
        ${DFILTER_FILES}
        ${FTYPE_FILES}
        ${WMEM_FILES}
@@ -1675,19 +1732,26 @@ add_library(epan ${LINK_MODE_LIB}
        ${DISSECTOR_FILES}
        ${DISSECTOR_SUPPORT_SRC}
        ${LIBWIRESHARK_ASM_FILES}
-       ../image/libwireshark.rc
+       ${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
-set(FULL_SO_VERSION "0.0.0")
+set(FULL_SO_VERSION "0.0.7")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 set_target_properties(epan PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0)
 
+if(ENABLE_APPLICATION_BUNDLE)
+       set_target_properties(epan PROPERTIES
+               LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
+       )
+endif()
+
 ABICHECK(libwireshark)
 
-file(GLOB COLUMN_INFO_HEADER column-info.h)
+file(GLOB EPAN_HEADERS *.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)
@@ -1696,6 +1760,7 @@ 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
@@ -1705,6 +1770,7 @@ file(MAKE_DIRECTORY ${ABICHECK_TMPDIR}
 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)
@@ -1722,11 +1788,12 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz
        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/*
        DEPENDS ${HEADERS}
-               ${CRYPT_HEADERS} ${DFILTER_HEADERS} ${D_HEADERS}
+               ${CRYPT_HEADERS} ${COMPRESS_HEADERS} ${DFILTER_HEADERS} ${D_HEADERS}
                ${FTYPES_HEADERS} ${WMEM_HEADERS} ${NGHTTP2_HEADERS} epan)
 
 # By default the name for a library with target name epan will be libepan,
@@ -1749,25 +1816,39 @@ 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")
+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")
+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)
-set_target_properties(oids_test PROPERTIES FOLDER "Tests")
+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")
+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")
+set_target_properties(tvbtest PROPERTIES
+       FOLDER "Tests"
+       COMPILE_DEFINITIONS "WS_BUILD_DLL"
+)
 
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
Unnamed repository; edit this file to name it for gitweb.