aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2011-12-01Dafine G_DISABLE_SINGLE_INCLUDES while compiling. This mimics a patchjmayer1-0/+1
that has been in configure.in for quite some while. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40056 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-09As reported by Michael Speck:stig1-4/+0
Removed last occurrences of USE_THREADS. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39775 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-07Change the use of threads from "mostly always, depending on yourgerald1-9/+2
configure options and Gtk+ and GLib versions" to "always". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39751 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-25Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGERjmayer1-4/+0
as it is the only option left. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39138 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-15Add a tap for showing all expert items.martinm1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39010 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-30Make it possible to disable building with libpcap.jmayer1-1/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38795 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-29Only build rawshark and dumpcap if we have libpcapjmayer1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38780 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-29rtp-player now compiles with gtk3jmayer1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38774 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-23GTK3 only builds if portaudio is disabled (rtp player is notjmayer1-1/+1
yet gtk3 ready). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38684 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-23Remove support for libpcre, we use GRegex in GLib.stig1-6/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38683 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-22Missed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGERjmayer1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38674 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-22Rename UI_MANAGER to ENABLE_UI_MANAGER, put it intojmayer1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38659 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-07mate_grammar.lemon:jmayer1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38393 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-05We can always add ${GTHREAD2_LIBRARIES} - this variable will be emptyjmayer1-3/+1
if not building with the gthread library. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38359 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-05Use GLIB2_LDFLAGS instead of GLIB2_LIBRARIES for wsutil, since itgerald1-0/+6
includes the path to the libraries. Add gthread to wireshark_LIBS if threads are enabled. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38345 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-02Define PACKAGE in config.h.gerald1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38316 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-02Add tap-hosts.c.gerald1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38313 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-19At the request of Tony Trinh on -dev, set(CMAKE_VERBOSE_MAKEFILE OFF)cmaynard1-2/+2
Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00156.html git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38103 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-16Add option for USE_THREADS.tuexen1-0/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38061 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-14Add LTE RLC stats tap to tshark.martinm1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38019 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-14Add LTE MAC statistics to tshark.martinm1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38016 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-12Copy over behaviour of commit 37967 for configure.injmayer1-1/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37994 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-22rev 37741 added tap-rtspstat.c to Makefile.common.jmayer1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37745 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-17Add configure options to make change the default file formatjmayer1-0/+4
from pcap-ng to pcap. Add a comment that GTK3 doesn't build yet. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37701 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-08Add GTK3 cmake options. It doesn't build, just like its configure pendant.jmayer1-5/+15
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37623 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-08From Roland Knall via bug 6007:stig1-1/+0
Remove plugins/interlink from CMake. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37614 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07Move packet-sercosiii.c to be a builtin dissector.etxrab1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37597 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19From Dirk Jagdmann via bug 5875:gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37298 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19Update CMakeLists to follow commit 37219.jmayer1-0/+4
Remove a duplicate check in configure.in git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37277 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-12Play catch up with recent configure.in changes:jmayer1-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 ..." git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37103 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-27Add frame_data_sequence.c.guy1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36885 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-11Add conversation tracking and tshark tap support to ICMPv6. Fixes bug 5810.cmaynard1-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.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36561 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-05Add ICMP tap support, and add a tshark tap to measure such things as:cmaynard1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36480 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-21From Roland Knall:jake1-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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36023 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-18dumpcap failed to link - add glib2 and wsutil libraries to fix this.jmayer1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35575 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-04Free dumpcap from linking to wiretap.jake1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35353 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-28u3.c has moved.jmayer1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35057 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-16First try to install docbook stuff as well - not yet workingjmayer1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34896 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-02- Pod stuff is independent of the guides, so check/usejmayer1-5/+3
it indepently. - AND needs to be in caps. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34325 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-01Fix for jmayer1-2/+5
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879 where the build would fail if no gtk2 development files were found. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34308 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-01- Reorder how packagetests are runjmayer1-21/+29
- Add packet-reload.c - Make most packages not-required (not tested) - Does *not* (yet) add an optional/whatever case to enable_ git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34307 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-28- Reset a few more variables used in FindXYZ scripts.jmayer1-4/+7
- README.cmake: small update. - Set a variable before using it for installation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34274 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-25- FindGLIB2.cmake updates fromjmayer1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34248 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-24Actually do what I said I did in the previous checkin.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34244 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-24Plugins are not shared libraries, so:guy1-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.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34243 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Undo some part of jmayer1-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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34226 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23H.sivank:jmayer1-4/+9
Cmake fixes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34225 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Some CMake fixes from H.sivank:stig1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34224 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Copy behaviour ofjmayer1-1/+0
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34145 to cmake. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34205 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23H. Sivank <hsivank@gmail.com>jmayer1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34201 f5534014-38df-0310-8fa8-9805f1628bb7