git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add dissector for CP "Cooper" 2179 Protocol
[metze/wireshark/wip.git] / epan / CMakeLists.txt
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 0a47ae65006899583ffc5dc3ef519cbca1e1f349..2584b4db4e7713e409dd6a8b1ca2a10c4772f229 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists.txt
 #
-# $Id$
-#
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
@@ -23,6 +21,8 @@
 
 include(UseABICheck)
 
+include(CMakeListsCustom.txt)
+
 if (HAVE_HFI_SECTION_INIT)
        add_definitions(
                -DHAVE_HFI_SECTION_INIT
@@ -35,11 +35,6 @@ if (HAVE_LIBLUA)
 endif()
 source_group(wslua FILES ${WSLUA_FILES})
 
-if (HAVE_LIBPYTHON)
-       include( wspython/CMakeLists.txt )
-endif()
-source_group(wspython FILES ${WSPYTHON_FILES})
-
 add_subdirectory( dissectors/dcerpc )
 
 include_directories(
@@ -48,7 +43,7 @@ include_directories(
        ${CMAKE_CURRENT_SOURCE_DIR}/dissectors
        ${CMAKE_CURRENT_SOURCE_DIR}/ftypes
        ${CMAKE_CURRENT_SOURCE_DIR}/wslua
-       ${CMAKE_CURRENT_SOURCE_DIR}/wspython
+       ${CMAKE_CURRENT_SOURCE_DIR}/nghttp2
 )
 
 set(CRYPT_FILES
@@ -57,6 +52,7 @@ set(CRYPT_FILES
        crypt/airpdcap_debug.c
        crypt/airpdcap_rijndael.c
        crypt/airpdcap_tkip.c
+       ${CUSTOM_CRYPT_SRC}
 )
 source_group(crypt FILES ${CRYPT_FILES})
 
@@ -187,6 +183,7 @@ set(DIRTY_PIDL_DISSECTOR_SRC
        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
 )
@@ -227,6 +224,7 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-ilp.c
        dissectors/packet-inap.c
        dissectors/packet-isdn-sup.c
+       dissectors/packet-kerberos.c
        dissectors/packet-lcsap.c
        dissectors/packet-logotypecertextn.c
        dissectors/packet-lpp.c
@@ -252,6 +250,7 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-pkixproxy.c
        dissectors/packet-pkixqualified.c
        dissectors/packet-pkixtsp.c
+       dissectors/packet-pktap.c
        dissectors/packet-q932.c
        dissectors/packet-q932-ros.c
        dissectors/packet-qsig.c
@@ -301,19 +300,24 @@ set(DIRTY_ASN1_DISSECTOR_SRC
 set(DISSECTOR_SRC
        dissectors/file-elf.c
        dissectors/file-file.c
+       dissectors/file-gif.c
+       dissectors/file-jpeg.c
        dissectors/file-mp4.c
+       dissectors/file-png.c
        dissectors/packet-2dparityfec.c
        dissectors/packet-3com-njack.c
        dissectors/packet-3com-xns.c
        dissectors/packet-3g-a11.c
        dissectors/packet-6lowpan.c
        dissectors/packet-9p.c
+       dissectors/packet-a21.c
        dissectors/packet-aarp.c
        dissectors/packet-aastra-aasp.c
        dissectors/packet-acap.c
        dissectors/packet-acn.c
        dissectors/packet-acr122.c
        dissectors/packet-actrace.c
+       dissectors/packet-adb_cs.c
        dissectors/packet-adwin-config.c
        dissectors/packet-adwin.c
        dissectors/packet-afp.c
@@ -343,6 +347,7 @@ set(DISSECTOR_SRC
        dissectors/packet-aim.c
        dissectors/packet-ajp13.c
        dissectors/packet-alcap.c
+       dissectors/packet-alljoyn.c
        dissectors/packet-amqp.c
        dissectors/packet-amr.c
        dissectors/packet-ancp.c
@@ -364,6 +369,7 @@ set(DISSECTOR_SRC
        dissectors/packet-artnet.c
        dissectors/packet-aruba-adp.c
        dissectors/packet-aruba-erm.c
+       dissectors/packet-aruba-iap.c
        dissectors/packet-aruba-papi.c
        dissectors/packet-ar_drone.c
        dissectors/packet-asap.c
@@ -389,6 +395,7 @@ set(DISSECTOR_SRC
        dissectors/packet-batadv.c
        dissectors/packet-bctp.c
        dissectors/packet-beep.c
+       dissectors/packet-bencode.c
        dissectors/packet-ber.c
        dissectors/packet-bfcp.c
        dissectors/packet-bfd.c
@@ -424,6 +431,7 @@ set(DISSECTOR_SRC
        dissectors/packet-bthid.c
        dissectors/packet-bthsp.c
        dissectors/packet-btle.c
+       dissectors/packet-btle_rf.c
        dissectors/packet-btl2cap.c
        dissectors/packet-btmcap.c
        dissectors/packet-btobex.c
@@ -443,9 +451,11 @@ set(DISSECTOR_SRC
        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
+       dissectors/packet-chargen.c
        dissectors/packet-chdlc.c
        dissectors/packet-cigi.c
        dissectors/packet-cimd.c
@@ -469,7 +479,10 @@ set(DISSECTOR_SRC
        dissectors/packet-collectd.c
        dissectors/packet-componentstatus.c
        dissectors/packet-cops.c
+       dissectors/packet-corosync-totemnet.c
+       dissectors/packet-corosync-totemsrp.c
        dissectors/packet-cosine.c
+       dissectors/packet-cp2179.c
        dissectors/packet-cpfi.c
        dissectors/packet-cpha.c
        dissectors/packet-csm-encaps.c
@@ -558,9 +571,6 @@ set(DISSECTOR_SRC
        dissectors/packet-diameter.c
        dissectors/packet-diameter_3gpp.c
        dissectors/packet-diffserv-mpls-common.c
-       dissectors/packet-dis-enums.c
-       dissectors/packet-dis-fields.c
-       dissectors/packet-dis-pdus.c
        dissectors/packet-dis.c
        dissectors/packet-distcc.c
        dissectors/packet-dlm3.c
@@ -610,6 +620,7 @@ set(DISSECTOR_SRC
        dissectors/packet-eigrp.c
        dissectors/packet-eiss.c
        dissectors/packet-elcom.c
+       dissectors/packet-elmi.c
        dissectors/packet-enc.c
        dissectors/packet-enip.c
        dissectors/packet-enrp.c
@@ -617,6 +628,7 @@ set(DISSECTOR_SRC
        dissectors/packet-epl.c
        dissectors/packet-epl_v1.c
        dissectors/packet-epmd.c
+       dissectors/packet-epon.c
        dissectors/packet-erf.c
        dissectors/packet-erldp.c
        dissectors/packet-esio.c
@@ -629,6 +641,7 @@ set(DISSECTOR_SRC
        dissectors/packet-etv.c
        dissectors/packet-evrc.c
        dissectors/packet-exec.c
+       dissectors/packet-exported_pdu.c
        dissectors/packet-extreme.c
        dissectors/packet-fc.c
        dissectors/packet-fcct.c
@@ -667,9 +680,11 @@ set(DISSECTOR_SRC
        dissectors/packet-fw1.c
        dissectors/packet-g723.c
        dissectors/packet-gadu-gadu.c
+       dissectors/packet-gdb.c
        dissectors/packet-gdsdb.c
        dissectors/packet-gearman.c
        dissectors/packet-ged125.c
+       dissectors/packet-geneve.c
        dissectors/packet-gift.c
        dissectors/packet-giop.c
        dissectors/packet-git.c
@@ -738,7 +753,9 @@ set(DISSECTOR_SRC
        dissectors/packet-hdcp2.c
        dissectors/packet-hdfs.c
        dissectors/packet-hdfsdata.c
+       dissectors/packet-hdmi.c
        dissectors/packet-hip.c
+       dissectors/packet-hislip.c
        dissectors/packet-homeplug-av.c
        dissectors/packet-homeplug.c
        dissectors/packet-hp-erm.c
@@ -767,6 +784,7 @@ set(DISSECTOR_SRC
        dissectors/packet-idrp.c
        dissectors/packet-iec104.c
        dissectors/packet-ieee1722.c
+       dissectors/packet-ieee1722a.c
        dissectors/packet-ieee17221.c
        dissectors/packet-ieee80211-airopeek.c
        dissectors/packet-ieee80211-netmon.c
@@ -784,9 +802,6 @@ set(DISSECTOR_SRC
        dissectors/packet-igap.c
        dissectors/packet-igmp.c
        dissectors/packet-igrp.c
-       dissectors/packet-image-gif.c
-       dissectors/packet-image-jfif.c
-       dissectors/packet-image-png.c
        dissectors/packet-imap.c
        dissectors/packet-imf.c
        dissectors/packet-infiniband.c
@@ -796,8 +811,19 @@ set(DISSECTOR_SRC
        dissectors/packet-ipars.c
        dissectors/packet-ipdc.c
        dissectors/packet-ipfc.c
-       dissectors/packet-ipmi-session.c
        dissectors/packet-ipmi.c
+       dissectors/packet-ipmi-app.c
+       dissectors/packet-ipmi-bridge.c
+       dissectors/packet-ipmi-chassis.c
+       dissectors/packet-ipmi-picmg.c
+       dissectors/packet-ipmi-se.c
+       dissectors/packet-ipmi-session.c
+       dissectors/packet-ipmi-storage.c
+       dissectors/packet-ipmi-trace.c
+       dissectors/packet-ipmi-transport.c
+       dissectors/packet-ipmi-pps.c
+       dissectors/packet-ipmi-update.c
+       dissectors/packet-ipmi-vita.c
        dissectors/packet-ipnet.c
        dissectors/packet-ipoib.c
        dissectors/packet-ipp.c
@@ -813,6 +839,7 @@ set(DISSECTOR_SRC
        dissectors/packet-isakmp.c
        dissectors/packet-iscsi.c
        dissectors/packet-isdn.c
+       dissectors/packet-iser.c
        dissectors/packet-isis-clv.c
        dissectors/packet-isis-hello.c
        dissectors/packet-isis-lsp.c
@@ -842,7 +869,6 @@ set(DISSECTOR_SRC
        dissectors/packet-kafka.c
        dissectors/packet-kdp.c
        dissectors/packet-kdsp.c
-       dissectors/packet-kerberos.c
        dissectors/packet-kerberos4.c
        dissectors/packet-kingfisher.c
        dissectors/packet-kink.c
@@ -853,6 +879,7 @@ set(DISSECTOR_SRC
        dissectors/packet-kt.c
        dissectors/packet-l1-events.c
        dissectors/packet-l2tp.c
+       dissectors/packet-lacp.c
        dissectors/packet-lanforge.c
        dissectors/packet-lapb.c
        dissectors/packet-lapbether.c
@@ -860,9 +887,19 @@ set(DISSECTOR_SRC
        dissectors/packet-lapdm.c
        dissectors/packet-laplink.c
        dissectors/packet-lapsat.c
+       dissectors/packet-lbm.c
+       dissectors/packet-lbmc.c
+       dissectors/packet-lbmpdm.c
+       dissectors/packet-lbmpdmtcp.c
+       dissectors/packet-lbmr.c
+       dissectors/packet-lbtrm.c
+       dissectors/packet-lbtru.c
+       dissectors/packet-lbttcp.c
        dissectors/packet-ldp.c
        dissectors/packet-ldss.c
+       dissectors/packet-lg8979.c
        dissectors/packet-lge_monitor.c
+       dissectors/packet-link16.c
        dissectors/packet-linx.c
        dissectors/packet-lisp-data.c
        dissectors/packet-lisp.c
@@ -870,14 +907,18 @@ set(DISSECTOR_SRC
        dissectors/packet-lldp.c
        dissectors/packet-llrp.c
        dissectors/packet-llt.c
+       dissectors/packet-lltd.c
        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
        dissectors/packet-lsc.c
        dissectors/packet-ltp.c
        dissectors/packet-lwapp.c
+       dissectors/packet-lwm.c
        dissectors/packet-lwres.c
        dissectors/packet-m2pa.c
        dissectors/packet-m2tp.c
@@ -890,6 +931,8 @@ set(DISSECTOR_SRC
        dissectors/packet-macsec.c
        dissectors/packet-mactelnet.c
        dissectors/packet-manolito.c
+       dissectors/packet-marker.c
+       dissectors/packet-mausb.c
        dissectors/packet-mbim.c
        dissectors/packet-mbtcp.c
        dissectors/packet-mdshdr.c
@@ -932,6 +975,7 @@ set(DISSECTOR_SRC
        dissectors/packet-mq-base.c
        dissectors/packet-mq-pcf.c
        dissectors/packet-mq.c
+       dissectors/packet-mqtt.c
        dissectors/packet-mrcpv2.c
        dissectors/packet-mrdisc.c
        dissectors/packet-mrp-mmrp.c
@@ -1000,6 +1044,7 @@ set(DISSECTOR_SRC
        dissectors/packet-ntp.c
        dissectors/packet-null.c
        dissectors/packet-nwmtp.c
+       dissectors/packet-oampdu.c
        dissectors/packet-oicq.c
        dissectors/packet-oipf.c
        dissectors/packet-olsr.c
@@ -1013,21 +1058,27 @@ set(DISSECTOR_SRC
        dissectors/packet-openvpn.c
        dissectors/packet-openwire.c
        dissectors/packet-opsi.c
+       dissectors/packet-optommp.c
+       dissectors/packet-osc.c
        dissectors/packet-osi-options.c
        dissectors/packet-osi.c
        dissectors/packet-ositp.c
        dissectors/packet-ospf.c
+       dissectors/packet-ossp.c
        dissectors/packet-ouch.c
        dissectors/packet-p_mul.c
+       dissectors/packet-pathport.c
        dissectors/packet-packetbb.c
        dissectors/packet-packetlogger.c
        dissectors/packet-pagp.c
        dissectors/packet-paltalk.c
        dissectors/packet-pana.c
+       dissectors/packet-pcapng_block.c
        dissectors/packet-pcep.c
        dissectors/packet-pcli.c
        dissectors/packet-pcnfsd.c
        dissectors/packet-pcp.c
+       dissectors/packet-pdc.c
        dissectors/packet-pdcp-lte.c
        dissectors/packet-peekremote.c
        dissectors/packet-per.c
@@ -1176,6 +1227,7 @@ set(DISSECTOR_SRC
        dissectors/packet-smb-mailslot.c
        dissectors/packet-smb-pipe.c
        dissectors/packet-smb-sidsnooping.c
+       dissectors/packet-smb-direct.c
        dissectors/packet-smb.c
        dissectors/packet-smb2.c
        dissectors/packet-sml.c
@@ -1188,6 +1240,7 @@ set(DISSECTOR_SRC
        dissectors/packet-socketcan.c
        dissectors/packet-socks.c
        dissectors/packet-soupbintcp.c
+       dissectors/packet-spdy.c
        dissectors/packet-spice.c
        dissectors/packet-spp.c
        dissectors/packet-spray.c
@@ -1203,8 +1256,10 @@ set(DISSECTOR_SRC
        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
        dissectors/packet-symantec.c
        dissectors/packet-sync.c
        dissectors/packet-synergy.c
@@ -1283,6 +1338,7 @@ set(DISSECTOR_SRC
        dissectors/packet-vmlab.c
        dissectors/packet-vnc.c
        dissectors/packet-vntag.c
+       dissectors/packet-vp8.c
        dissectors/packet-vrrp.c
        dissectors/packet-vrt.c
        dissectors/packet-vssmonitoring.c
@@ -1362,21 +1418,7 @@ set(DIRTY_DISSECTOR_SRC
        dissectors/packet-x11.c
 )
 
-# IPMI sub-parsers for each network function code
-set(IPMI_SUBPARSERS
-       dissectors/packet-ipmi-app.c
-       dissectors/packet-ipmi-bridge.c
-       dissectors/packet-ipmi-chassis.c
-       dissectors/packet-ipmi-picmg.c
-       dissectors/packet-ipmi-se.c
-       dissectors/packet-ipmi-storage.c
-       dissectors/packet-ipmi-transport.c
-       dissectors/packet-ipmi-pps.c
-       dissectors/packet-ipmi-update.c
-)
-
 set(DISSECTOR_SUPPORT_SRC
-       ${IPMI_SUBPARSERS}
        dissectors/packet-dcerpc-nt.c
        dissectors/usb.c
        register.c
@@ -1406,6 +1448,8 @@ set(DISSECTOR_FILES
        ${DIRTY_PIDL_DISSECTOR_SRC}
        ${ASN1_DISSECTOR_SRC}
        ${DIRTY_ASN1_DISSECTOR_SRC}
+       ${CUSTOM_DISSECTOR_SRC}
+       ${CUSTOM_DIRTY_ASN1_DISSECTOR_SRC}
 )
 source_group(dissectors FILES ${DISSECTOR_FILES})
 
@@ -1434,9 +1478,11 @@ set(WMEM_FILES
        wmem/wmem_array.c
        wmem/wmem_core.c
        wmem/wmem_allocator_block.c
+       wmem/wmem_allocator_block_fast.c
        wmem/wmem_allocator_simple.c
        wmem/wmem_allocator_strict.c
        wmem/wmem_list.c
+       wmem/wmem_map.c
        wmem/wmem_miscutl.c
        wmem/wmem_scopes.c
        wmem/wmem_stack.c
@@ -1447,13 +1493,19 @@ set(WMEM_FILES
 )
 source_group(wmem FILES ${WMEM_FILES})
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT
-      sminmpec.c
+set(NGHTTP2_FILES
+       nghttp2/nghttp2_buf.c
+       nghttp2/nghttp2_hd.c
+       nghttp2/nghttp2_hd_huffman.c
+       nghttp2/nghttp2_hd_huffman_data.c
+       nghttp2/nghttp2_helper.c
+)
+source_group(nghttp2 FILES ${NGHTTP2_FILES})
+
+ADD_CUSTOM_TARGET(
+    update-sminmpec
     COMMAND ${PERL_EXECUTABLE}
       ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
-      ${CMAKE_CURRENT_SOURCE_DIR}/enterprise-numbers
-      sminmpec.c
     DEPENDS
       enterprise-numbers
       ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
@@ -1484,8 +1536,11 @@ set(LIBWIRESHARK_FILES
        column.c
        column-utils.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
@@ -1515,6 +1570,7 @@ set(LIBWIRESHARK_FILES
        next_tvb.c
        oids.c
        osi-utils.c
+       oui.c
        packet-range.c
        packet.c
        print.c
@@ -1586,7 +1642,6 @@ set(epan_LIBS
        ${SMI_LIBRARIES}
        ${M_LIBRARIES}
        ${LUA_LIBRARIES}
-       ${PYTHON_LIBRARIES}
        ${WIN_PSAPI_LIBRARY}
 )
 
@@ -1606,8 +1661,8 @@ set(CLEAN_FILES
        ${DISSECTOR_SUPPORT_SRC}
        ${LIBWIRESHARK_ASM_FILES}
        ${WMEM_FILES}
+       ${NGHTTP2_FILES}
        ${WSLUA_FILES}
-       ${WSPYTHON_FILES}
 )
 
 if (WERROR)
@@ -1627,15 +1682,14 @@ add_library(epan ${LINK_MODE_LIB}
        ${DFILTER_FILES}
        ${FTYPE_FILES}
        ${WMEM_FILES}
+       ${NGHTTP2_FILES}
        ${WSLUA_FILES}
-       ${WSPYTHON_FILES}
        ${DISSECTOR_FILES}
        ${DISSECTOR_SUPPORT_SRC}
        ${LIBWIRESHARK_ASM_FILES}
+       ../image/libwireshark.rc
 )
 
-add_dependencies(epan svnversion)
-
 set(FULL_SO_VERSION "0.0.0")
 
 set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
@@ -1644,18 +1698,21 @@ set_target_properties(epan PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0)
 
 ABICHECK(libwireshark)
 
+file(GLOB COLUMN_INFO_HEADER column-info.h)
 file(GLOB CRYPT_HEADERS crypt/*.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 NGHTTP2_HEADERS nghttp2/*.h)
 file(MAKE_DIRECTORY ${ABICHECK_TMPDIR}
        ${ABICHECK_TMPDIR}/epan
        ${ABICHECK_TMPDIR}/crypt
        ${ABICHECK_TMPDIR}/dfilter
        ${ABICHECK_TMPDIR}/dissectors
        ${ABICHECK_TMPDIR}/ftypes
-       ${ABICHECK_TMPDIR}/wmem)
+       ${ABICHECK_TMPDIR}/wmem
+       ${ABICHECK_TMPDIR}/nghttp2)
 
 file(COPY ../color.h ../register.h DESTINATION ${ABICHECK_TMPDIR})
 file(COPY ${HEADERS} DESTINATION ${ABICHECK_TMPDIR}/epan)
@@ -1664,6 +1721,7 @@ 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}
@@ -1678,14 +1736,18 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz
                ${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/crypt/*
                ${ABICHECK_TMPDIR}/dfilter/* ${ABICHECK_TMPDIR}/dissectors/*
                ${ABICHECK_TMPDIR}/ftypes/* ${ABICHECK_TMPDIR}/wmem/*
+               ${ABICHECK_TMPDIR}/nghttp2/*
        DEPENDS ${HEADERS}
                ${CRYPT_HEADERS} ${DFILTER_HEADERS} ${D_HEADERS}
-               ${FTYPES_HEADERS} ${WMEM_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
-SET_TARGET_PROPERTIES(epan PROPERTIES OUTPUT_NAME "wireshark")
-set_target_properties(epan PROPERTIES FOLDER "DLLs")
+SET_TARGET_PROPERTIES(epan PROPERTIES
+       OUTPUT_NAME "wireshark"
+       PREFIX "lib"
+       FOLDER "DLLs"
+)
 
 target_link_libraries(epan ${epan_LIBS})
 
@@ -1693,12 +1755,32 @@ add_dependencies(epan lemon)
 
 if(NOT ${ENABLE_STATIC})
        install(TARGETS epan
-               LIBRARY DESTINATION lib
-               RUNTIME DESTINATION lib
-               ARCHIVE DESTINATION lib
+               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+               RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+               ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        )
 endif()
 
+add_executable(wmem_test wmem/wmem_test.c ${WMEM_FILES})
+target_link_libraries(wmem_test ${GLIB2_LIBRARIES})
+set_target_properties(wmem_test PROPERTIES FOLDER "Tests")
+
+add_executable(exntest exntest.c except.c)
+target_link_libraries(exntest ${GLIB2_LIBRARIES})
+set_target_properties(exntest PROPERTIES FOLDER "Tests")
+
+add_executable(oids_test oids_test.c)
+target_link_libraries(oids_test epan)
+set_target_properties(oids_test PROPERTIES FOLDER "Tests")
+
+add_executable(reassemble_test reassemble_test.c)
+target_link_libraries(reassemble_test epan)
+set_target_properties(reassemble_test PROPERTIES FOLDER "Tests")
+
+add_executable(tvbtest tvbtest.c)
+target_link_libraries(tvbtest epan)
+set_target_properties(tvbtest PROPERTIES FOLDER "Tests")
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
Unnamed repository; edit this file to name it for gitweb.