aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2012-06-01No more GIOP plugins, no more plugins/giop directory.Guy Harris1-1/+0
svn path=/trunk/; revision=42984
2012-03-15Document which warnings are c++ only.Jörg Mayer1-9/+14
svn path=/trunk/; revision=41574
2012-03-08Reflect the move of alert_box.c to the ui directory.Guy Harris1-1/+1
svn path=/trunk/; revision=41437
2012-02-19Reflect the move of dftest.c back to the top-level directory.Guy Harris1-1/+1
svn path=/trunk/; revision=41065
2012-02-17Trying to fix the compile of ui/util.c on Windows by moving theJörg Mayer1-1/+3
source file directly into the sources variable - there seems to be a subtle difference between ui/util.c and epan/crypt/md5.c svn path=/trunk/; revision=41052
2012-02-17Start moving files to ui/ and ui/cli/Jörg Mayer1-42/+42
svn path=/trunk/; revision=41047
2012-02-08Last fix to the wrong approach.Jörg Mayer1-0/+1
svn path=/trunk/; revision=40925
2012-02-07Make sure that we only have to set (or pick up) the docdir environmentJörg Mayer1-1/+1
variable on the initial cmake run and not on later re-runs (like when some cmakelists.txt file changed and we call make). Of course this value should really be passed as an option instead of an environment variable but I want to document how to get the current approach working properly before switching to the proper approach. svn path=/trunk/; revision=40913
2012-02-05From QA Cafe:Anders Broman1-0/+1
Add support to follow UDP and TCP streams like wireshark does. UDP streams are selected with IP address/port pairs. TCP stream are selected with either the stream index or IP address/port pairs. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6684 svn path=/trunk/; revision=40852
2012-02-05Fix long standing but that prevented installation toJörg Mayer1-3/+3
work at all. Next step ist to move docbook installation back into docbook/ svn path=/trunk/; revision=40846
2012-02-04- Add a comment how to improve the output of supported features later on.Jörg Mayer1-1/+18
- Move docbook pdf installation to toplevel. svn path=/trunk/; revision=40840
2012-02-02- Move setting _U_ into config.h, becauseJörg Mayer1-4/+11
a) C++ has a standardized way of marking parameters as unused b) cmakes autoquoting magic failed when the compiler wasn't gcc but moc instead. - qtshark: Don't try to compile the c source files inside ui/qt/ - qtshark: Only run moc on the files that need it. - qtshark: It's too early to try any of the new qtshark files as clean. - Make Qt detection actually work - Add C++ to the list of languages for this project svn path=/trunk/; revision=40807
2012-02-02Prepare the cmake infrastucture for eventually buildingJörg Mayer1-16/+58
wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-01-20Manually revert the changes to CMakeLists.txt from commit 40602 - they ↵Jörg Mayer1-2/+2
should not be necessary/are wrong svn path=/trunk/; revision=40605
2012-01-20Bug 6448 says the embedded Python stuff does not really work.Jeff Morriss1-2/+2
And if I run Valgrind with Python enabled, I get pages of errors related to it. So: disable Python by default. svn path=/trunk/; revision=40602
2012-01-18Reflect the move of recent.c from ui/gtk to the top-level directory.Guy Harris1-0/+1
svn path=/trunk/; revision=40565
2012-01-16move alert box for cmake builds as wellJörg Mayer1-1/+1
svn path=/trunk/; revision=40542
2012-01-16alert_box.c moved to ui/Jörg Mayer1-1/+1
svn path=/trunk/; revision=40538
2012-01-15Move gtk to ui/gtk.Jörg Mayer1-2/+2
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518
2012-01-15Rename crypt-xxx to xxxJörg Mayer1-1/+1
svn path=/trunk/; revision=40511
2012-01-13Sync filelists between autofoo and cmake.Jörg Mayer1-1/+1
Move some dissectors that throw warnings to DIRTY_ Whitespace cleanups svn path=/trunk/; revision=40478
2012-01-12CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined beforeGerald Combs1-4/+4
register_tap_files so that the "-z" flag works for TShark. epan/stat_cmd_args.c: Fixup whitespace. svn path=/trunk/; revision=40443
2011-12-30I had a capture_errs.c but capture-wpcap.c eated it.Guy Harris1-1/+0
svn path=/trunk/; revision=40339
2011-12-01Dafine G_DISABLE_SINGLE_INCLUDES while compiling. This mimics a patchJörg Mayer1-0/+1
that has been in configure.in for quite some while. svn path=/trunk/; revision=40056
2011-11-09As reported by Michael Speck:Stig Bjørlykke1-4/+0
Removed last occurrences of USE_THREADS. svn path=/trunk/; revision=39775
2011-11-07Change the use of threads from "mostly always, depending on yourGerald Combs1-9/+2
configure options and Gtk+ and GLib versions" to "always". svn path=/trunk/; revision=39751
2011-09-25Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGERJörg Mayer1-4/+0
as it is the only option left. svn path=/trunk/; revision=39138
2011-09-15Add a tap for showing all expert items.Martin Mathieson1-0/+1
svn path=/trunk/; revision=39010
2011-08-30Make it possible to disable building with libpcap.Jörg Mayer1-1/+5
svn path=/trunk/; revision=38795
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