aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2012-09-24Update regexes to match the version string changes in r45112.Gerald Combs1-6/+6
svn path=/trunk/; revision=45114
2012-09-24From Jim Young, bug 7745.Martin Mathieson1-1/+19
Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-18*NIX (autofoo and cmake) part of the fix forJeff Morriss1-30/+41
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 : Make VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO available in config.h so (e.g.) dissector writers can #if around them as necessary to make a piece of code compile with different versions of Wireshark. (Hopefully VERSION_MICRO is not important in this respect!) Windows also defines VERSION_EXTRA which can be used to help identify custom builds; this is not done for these build methods (yet?). svn path=/trunk/; revision=44986
2012-09-15Update CMakeLists to respect the recent libui changes so that wireshark andEvan Huus1-1/+2
qtshark build again. (Also, first commit trying to use bzr as an svn client, so apologies if something unexpected breaks) svn path=/trunk/; revision=44908
2012-09-14Create a common libui using CMake similar to what we do with Autotools.Gerald Combs1-4/+6
Move the GTK+ text import code to the common UI directory. Create wtap_encap_requires_phdr() from code in file_import_dlg.c. svn path=/trunk/; revision=44904
2012-09-06Get netlink detection working with cmake (not complete)Jörg Mayer1-2/+3
svn path=/trunk/; revision=44791
2012-08-24Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all dependGerald Combs1-1/+0
on the GLib main loop which isn't portable (unless you want to want to manage the main loop yourself). svn path=/trunk/; revision=44655
2012-08-23Move the pipe input routines to the common UI directory.Gerald Combs1-0/+1
svn path=/trunk/; revision=44644
2012-08-23The proper way to set compiler flags in cmake is not by usingJörg Mayer1-1/+20
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these flags correctly at the toplevel, so no hack in the ui/qt/ subdir is required anymore. svn path=/trunk/; revision=44633
2012-08-23The name configure.in has been deprecated for many years.Jörg Mayer1-2/+2
Use configure.ac instead. svn path=/trunk/; revision=44630
2012-08-19Commit 44474 added some arguments to the ac_init macro that brokeJörg Mayer1-1/+1
extraction of the wireshark version for cmake. Now the version part is either terminated by ")" (old) or "," (added). It looks like .*? does not exist for non-greedy matches in cmake regex. svn path=/trunk/; revision=44570
2012-08-01Move the common parts of iface_lists.[ch] from ui/gtk/ to ui/. Leave theGerald Combs1-0/+1
GTK+-specific parts behind in capture_dlg.c. svn path=/trunk/; revision=44196
2012-07-20WiMAX OFDMA PHY SAP dissector plugin ↵Michael Mann1-0/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) svn path=/trunk/; revision=43844
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28From Pontus Fuchs:Guy Harris1-0/+2
Add an interface monitor that, on Linux distributions with libnl, watches for interfaces to appear or disappear and, on such an event, causes windows showing interface lists to update. svn path=/trunk/; revision=43521
2012-06-25From Tony Trinh:Anders Broman1-1/+1
Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-24Also add ws80211_utils.c for CMake builds.Jörg Mayer1-0/+2
Build with -g to make debugging easier. The debug info will get removed on installation. svn path=/trunk/; revision=43464
2012-06-20Complete cmake support for netlink detectionJörg Mayer1-0/+8
svn path=/trunk/; revision=43421
2012-06-20And another instance of HAVE_WIRELESS_TOOLBAR I missedJörg Mayer1-1/+0
svn path=/trunk/; revision=43418
2012-06-20Copy over Makefile.common changes to CMakeListsJörg Mayer1-0/+1
svn path=/trunk/; revision=43416
2012-06-19Do the changes to configure from r43354 in cmake as well.Jörg Mayer1-0/+1
Log: Start to have an generic wireless toolbar. Sligtly modified patch from Pontus Fuchs. svn path=/trunk/; revision=43361
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