git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add OCFS2 dissector.
[metze/wireshark/wip.git] / epan / CMakeLists.txt
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 889e0f0ed66569ed9a724ac1c642d454b7e34bd2..c0be675cfbe5cb8357af9d733fc203e0b6b5272c 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
 )
 
@@ -196,6 +199,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 +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
@@ -231,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
@@ -256,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
@@ -271,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
@@ -282,22 +296,17 @@ set(ASN1_DISSECTOR_SRC
 )
 
 set(DIRTY_ASN1_DISSECTOR_SRC
-       dissectors/packet-coseventcomm.c
-       dissectors/packet-cosnaming.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-parlay.c
+       dissectors/packet-tango.c
 )
 
 set(DISSECTOR_SRC
@@ -410,6 +419,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
@@ -432,6 +442,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
@@ -454,6 +465,7 @@ set(DISSECTOR_SRC
        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
@@ -580,6 +592,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
@@ -761,6 +774,7 @@ 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
@@ -1019,7 +1033,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
@@ -1062,6 +1076,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
@@ -1137,6 +1152,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
@@ -1185,6 +1201,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
@@ -1274,6 +1291,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
@@ -1363,6 +1381,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
@@ -1435,6 +1454,7 @@ set(DISSECTOR_SRC
        dissectors/packet-zep.c
        dissectors/packet-ziop.c
        dissectors/packet-zrtp.c
+       dissectors/packet-zvt.c
 )
 
 set(DISSECTOR_SUPPORT_SRC
@@ -1465,6 +1485,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}
 )
@@ -1516,6 +1537,7 @@ 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})
 
@@ -1527,6 +1549,7 @@ ADD_CUSTOM_TARGET(
                enterprise-numbers
                ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
 )
+set_target_properties(update-sminmpec PROPERTIES FOLDER "tools")
 
 ADD_CUSTOM_COMMAND(
        OUTPUT  ps.c
@@ -1542,12 +1565,11 @@ 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
@@ -1565,7 +1587,6 @@ set(LIBWIRESHARK_FILES
        dissector_filters.c
        dvb_chartbl.c
        dwarf.c
-       emem.c
        epan.c
        ex-opt.c
        except.c
@@ -1577,11 +1598,11 @@ set(LIBWIRESHARK_FILES
        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
@@ -1601,10 +1622,7 @@ 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_tap_ui.c
        stats_tree.c
        strutil.c
@@ -1708,10 +1726,10 @@ 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.6")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
 set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
@@ -1792,34 +1810,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.