aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2011-08-29Only build rawshark and dumpcap if we have libpcapJörg Mayer1-2/+2
svn path=/trunk/; revision=38780
2011-08-29rtp-player now compiles with gtk3Jörg Mayer1-1/+1
svn path=/trunk/; revision=38774
2011-08-23GTK3 only builds if portaudio is disabled (rtp player is notJörg Mayer1-1/+1
yet gtk3 ready). svn path=/trunk/; revision=38684
2011-08-23Remove support for libpcre, we use GRegex in GLib.Stig Bjørlykke1-6/+0
svn path=/trunk/; revision=38683
2011-08-22Missed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGERJörg Mayer1-1/+1
svn path=/trunk/; revision=38674
2011-08-22Rename UI_MANAGER to ENABLE_UI_MANAGER, put it intoJörg Mayer1-0/+3
CMakeOptions and enable it by default. Update comment in proto_help that this feature is no longer built by default. Enable PYTHON by default. svn path=/trunk/; revision=38659
2011-08-07mate_grammar.lemon:Jörg Mayer1-2/+5
- Fix a bug my previous patch introduced. mate/: - Unset G_DISABLE_DEPRECATED for the mate files. CMakeLists.txt configure.in: - Build with -DG_DISABLE_DEPRECATED so further usage of deprecated glib functions will be detected. svn path=/trunk/; revision=38393
2011-08-05We can always add ${GTHREAD2_LIBRARIES} - this variable will be emptyJörg Mayer1-3/+1
if not building with the gthread library. svn path=/trunk/; revision=38359
2011-08-05Use GLIB2_LDFLAGS instead of GLIB2_LIBRARIES for wsutil, since itGerald Combs1-0/+6
includes the path to the libraries. Add gthread to wireshark_LIBS if threads are enabled. svn path=/trunk/; revision=38345
2011-08-02Define PACKAGE in config.h.Gerald Combs1-1/+0
svn path=/trunk/; revision=38316
2011-08-02Add tap-hosts.c.Gerald Combs1-0/+1
svn path=/trunk/; revision=38313
2011-07-19At the request of Tony Trinh on -dev, set(CMAKE_VERBOSE_MAKEFILE OFF)Chris Maynard1-2/+2
Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00156.html svn path=/trunk/; revision=38103
2011-07-16Add option for USE_THREADS.Michael Tüxen1-0/+4
svn path=/trunk/; revision=38061
2011-07-14Add LTE RLC stats tap to tshark.Martin Mathieson1-0/+1
svn path=/trunk/; revision=38019
2011-07-14Add LTE MAC statistics to tshark.Martin Mathieson1-0/+1
svn path=/trunk/; revision=38016
2011-07-12Copy over behaviour of commit 37967 for configure.inJörg Mayer1-1/+2
svn path=/trunk/; revision=37994
2011-06-22rev 37741 added tap-rtspstat.c to Makefile.common.Jörg Mayer1-0/+1
svn path=/trunk/; revision=37745
2011-06-17Add configure options to make change the default file formatJörg Mayer1-0/+4
from pcap-ng to pcap. Add a comment that GTK3 doesn't build yet. svn path=/trunk/; revision=37701
2011-06-08Add GTK3 cmake options. It doesn't build, just like its configure pendant.Jörg Mayer1-5/+15
svn path=/trunk/; revision=37623
2011-06-08From Roland Knall via bug 6007:Stig Bjørlykke1-1/+0
Remove plugins/interlink from CMake. svn path=/trunk/; revision=37614
2011-06-07Move packet-sercosiii.c to be a builtin dissector.Anders Broman1-1/+0
svn path=/trunk/; revision=37597
2011-05-19From Dirk Jagdmann via bug 5875:Gerald Combs1-0/+1
My attachment adds a link to a XSLT file to the preamble of the PDML. The XSLT will transform the PDML to a HTML page, and the HTML page features a look similar to Wireshark. See http://cubic.org/~doj/ebay/a.pdml for an example. The patch also contains a small perl program which converts the Wireshark colortable into javascript code which is used in the XSLT file. If you want to use a different color scheme you would execute the perl program and insert the generated javascript function into your XSLT file. To view the HTML you could either place the PDML and XSLT file on your webserver and verify that your webserver sends the PDML file as "text/xml". Then your webbrowser will find the linked XSLT file, download that as well and convert the PDML to HTML on the fly. You could also use an XSLT processor like xsltproc to convert the PDML and XSLT into a static HTML file. From me: Minor fixups. svn path=/trunk/; revision=37298
2011-05-19Update CMakeLists to follow commit 37219.Jörg Mayer1-0/+4
Remove a duplicate check in configure.in svn path=/trunk/; revision=37277
2011-05-12Play catch up with recent configure.in changes:Jörg Mayer1-0/+6
- Link dumpcap (and only dumpcap) against gthread - gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1 - Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..." svn path=/trunk/; revision=37103
2011-04-27Add frame_data_sequence.c.Guy Harris1-0/+1
svn path=/trunk/; revision=36885
2011-04-11Add conversation tracking and tshark tap support to ICMPv6. Fixes bug 5810.Chris Maynard1-0/+1
TODO: Add a Wireshark tap or look into possibly using the stats tree instead. Also, like ICMP, the ICMPv6 payload appears to carry the sender's timestamp, so it might be possible to make use of this information to estimate the total SRT. (See bug 5770 for more details.) svn path=/trunk/; revision=36561
2011-04-05Add ICMP tap support, and add a tshark tap to measure such things as:Chris Maynard1-0/+1
* Number of ICMP echo requests, replies, lost replies and percent loss. * Min, Max, Average SRT (Service Response Time), and standard deviation. (This is my first tap, so hopefully I didn't miss something, but we'll see ...) TODO: Add a Wireshark tap. svn path=/trunk/; revision=36480
2011-02-21From Roland Knall:Jaap Keuter1-0/+3
WS_MSVC_NORETURN is undeclared under a non-Windows operating system, which breaks compilation in the files epan/except.c and dumpcap.c as well as any file including epan/except.h svn path=/trunk/; revision=36023
2011-01-18dumpcap failed to link - add glib2 and wsutil libraries to fix this.Jörg Mayer1-0/+2
svn path=/trunk/; revision=35575
2011-01-04Free dumpcap from linking to wiretap.Jaap Keuter1-1/+0
svn path=/trunk/; revision=35353
2010-11-28u3.c has moved.Jörg Mayer1-0/+1
svn path=/trunk/; revision=35057
2010-11-16First try to install docbook stuff as well - not yet workingJörg Mayer1-0/+1
svn path=/trunk/; revision=34896
2010-10-02- Pod stuff is independent of the guides, so check/useJörg Mayer1-5/+3
it indepently. - AND needs to be in caps. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879 svn path=/trunk/; revision=34325
2010-10-01Fix for Jörg Mayer1-2/+5
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879 where the build would fail if no gtk2 development files were found. svn path=/trunk/; revision=34308
2010-10-01- Reorder how packagetests are runJörg Mayer1-21/+29
- Add packet-reload.c - Make most packages not-required (not tested) - Does *not* (yet) add an optional/whatever case to enable_ svn path=/trunk/; revision=34307
2010-09-28- Reset a few more variables used in FindXYZ scripts.Jörg Mayer1-4/+7
- README.cmake: small update. - Set a variable before using it for installation. svn path=/trunk/; revision=34274
2010-09-25- FindGLIB2.cmake updates fromJörg Mayer1-1/+1
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules + split out FindGMODULE2.cmake + contains /sw/... by default + supposedly tested on OSX - Disable pcre for cmake builds by default, gregex should be picked up automatically if glib2 is not too old. Should you have trouble linking due to some libgmodule... stuff undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}" an report back. svn path=/trunk/; revision=34248
2010-09-24Actually do what I said I did in the previous checkin.Guy Harris1-1/+1
svn path=/trunk/; revision=34244
2010-09-24Plugins are not shared libraries, so:Guy Harris1-5/+1
1) don't set thei SOVERSION - run-time-loaded modules don't have an SOVERSION; 2) build them with link mode MODULE, not SHARED, on all platforms. (Fixing 1) also fixes the problem with building them as MODULE on OS X.) svn path=/trunk/; revision=34243
2010-09-23Undo some part of Jörg Mayer1-13/+6
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34224 This fix is wrong. We need to find out why this fails and correct it in svn path=/trunk/; revision=34226
2010-09-23H.sivank:Jörg Mayer1-4/+9
Cmake fixes. svn path=/trunk/; revision=34225
2010-09-23Some CMake fixes from H.sivank:Stig Bjørlykke1-12/+18
- Apple gcc does not like "-Wl,--as-needed". - Fix plugins link step on OSX. - Put AUTHORS-SHORT, AUTHORS-SHORT-FORMAT and wireshark.pod in build directory. svn path=/trunk/; revision=34224
2010-09-23Copy behaviour ofJörg Mayer1-1/+0
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34145 to cmake. svn path=/trunk/; revision=34205
2010-09-23H. Sivank <hsivank@gmail.com>Jörg Mayer1-10/+10
I try to configure Wireshark with cmake on macosx 10.6. It fails with : set_target_properties called with incorrect number of arguments. Attached a patch to fix this issue. svn path=/trunk/; revision=34201
2010-09-23Try to add support to learn the HTML_VIEWER variable and the DOC_DIR ↵Jörg Mayer1-0/+9
variables from the environment - not yet working svn path=/trunk/; revision=34200
2010-09-18From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5223 :Jeff Morriss1-0/+1
I would like to contribute iSCSI SRT tap, 'tap-scsistat.c' for tshark. The output exactly matches that of the Wireshark's iSCSI(disk) SRT dialog. From me: a couple of small changes to make it compile without warnings. svn path=/trunk/; revision=34152
2010-09-10Use absolute paths in link_directories.Stig Bjørlykke1-5/+5
svn path=/trunk/; revision=34098
2010-07-17- Copy over from Makefile.am: dumpcap doesn't need to linkJörg Mayer1-2/+1
in libgcrypt and gnutls. - capinfos has a dependency on svnversion.h svn path=/trunk/; revision=33559
2010-07-15Fix cmake build for wireshark-filters.Jörg Mayer1-1/+1
svn path=/trunk/; revision=33546
2010-07-15Don't include the filter list (which is now over 16MB) in theGerald Combs1-14/+0
wireshark-filter man page. Point to other sources for the list instead. svn path=/trunk/; revision=33539