summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2014-02-20Add missing SBC library to cmake buildMichal Labedzki1-0/+1
Change-Id: I4eb2dacc196b8feef62ff633322c53c04f78fc92 Reviewed-on: https://code.wireshark.org/review/252 Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-17Add Bluetooth SBC Codec support in cmakeMichal Labedzki1-0/+7
SBC Codec can be optionally linked with Wireshark to provide ability to playing RTP/SBC stream by RTP Player. Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5 Reviewed-on: https://code.wireshark.org/review/223 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-14Disable tfshark taps for now.Evan Huus1-1/+0
Should fix build issue and none of the current taps are relevant to tfshark anyways. Change-Id: I29168e0b296cd64fe3783de63e1fdd2a472ee6d3 Reviewed-on: https://code.wireshark.org/review/218 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-19/+20
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-19Error doesn't exist, use warning instead.Jörg Mayer1-1/+1
svn path=/trunk/; revision=54841
2014-01-19Add option to specify special permissions for dumpcap during cmake phase:Jörg Mayer1-4/+33
set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-18-Warray-bounds was listed twiceJörg Mayer1-1/+0
svn path=/trunk/; revision=54839
2014-01-09Move cfile.c into SHARK_COMMON_SRC (as was done in nmake)Jörg Mayer1-4/+1
svn path=/trunk/; revision=54678
2014-01-08make tfshark finally compile:Jörg Mayer1-1/+3
- Link against filetap - Add cfile.c to sources - Add the generated tshark-tap-register.c (which seems to be pulled in by one of the intermediate libraries with autotools) svn path=/trunk/; revision=54674
2014-01-08TFShark doesn't capture traffic, so it doesn't needGuy Harris1-1/+0
SHARK_COMMON_CAPTURE_SRC. svn path=/trunk/; revision=54672
2014-01-08At least some of the files in PLATFORM_CAPTURE_SRC are needed byGuy Harris1-4/+4
programs that use {lib,win}pcap but that don't capture traffic, such as rawshark; rename it to PLATFORM_PCAP_SRC, and include it in SHARK_COMMON_SRC rather than SHARK_COMMON_CAPTURE_SRC. svn path=/trunk/; revision=54670
2014-01-08Rename WIRESHARK_COMMON_SRC to SHARK_COMMON_SRC - what's common about itGuy Harris1-13/+15
is that it includes files used in TShark and rawshark as well as Wireshark, and that name is what's used by the autotools. Add capture_sync.c to SHARK_COMMON_CAPTURE_SRC, as it's used both by Wireshark and TShark, but not by rawshark, and as it's in the autotools SHARK_COMMON_CAPTURE_SRC. Move PLATFORM_CAPTURE_SRC from (WIRE)SHARK_COMMON_SRC to SHARK_COMMON_CAPTURE_SRC, as it should only be used by programs that capture traffic. svn path=/trunk/; revision=54668
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-1/+25
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-07Rework compiler flag detection to be able to handle changedJörg Mayer1-23/+18
order of flags svn path=/trunk/; revision=54638
2014-01-03Check flags that might be supported by both C and C++ stillJörg Mayer1-1/+12
separately. svn path=/trunk/; revision=54573
2014-01-03As discussed on wireshark-dev: follow autotools to useJörg Mayer1-1/+3
-Wshorten-64-to-32 for c only svn path=/trunk/; revision=54572
2014-01-02Actually enable building filetap library.Jörg Mayer1-1/+4
NEWS changed svn path=/trunk/; revision=54560
2014-01-02Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.Anders Broman1-1/+0
svn path=/trunk/; revision=54559
2013-12-22Generated stuff does not belong into the source treeJörg Mayer1-1/+1
svn path=/trunk/; revision=54349
2013-12-22Beginnings of doxygen support.Jörg Mayer1-0/+30
Currently the doxygen.cfg files are not designed for out-of-tree builds - that needs to be fixed first. svn path=/trunk/; revision=54348
2013-12-13Add a "captype" file that just reports the type of a capture file, basedGuy Harris1-1/+24
on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-04Create all binaries in one directory. After running setpath.batJörg Mayer1-2/+10
wireshark etc should now work, the basic stuff at least. Known problems/todos: - The plugins are not searched for in the current directory, so find out how to let Wireshark know to search for the plugins - Other supporting files are missing (COPYING.txt, AUTHORS*, ...) - Your missing feature could be listed here ;) Ciao Jörg svn path=/trunk/; revision=53780
2013-12-02Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part ofJörg Mayer1-1/+2
the QT5_BASE_DIR value. svn path=/trunk/; revision=53717
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris1-8/+0
knowledge of particular types of plugins. Instead, let particular types of plugins register with the common plugin code, giving a name and a routine to recognize that type of plugin. In particular applications, only process the relevant plugin types. Add a Makefile.common to the codecs directory. svn path=/trunk/; revision=53710
2013-12-01Small style changes.Jörg Mayer1-6/+6
svn path=/trunk/; revision=53701
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer1-3/+3
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
2013-11-30Looks like the WinPcap version can only be determined from theJörg Mayer1-1/+2
name of the compressed archive - which currently means "only by manual developer intervention". svn path=/trunk/; revision=53682
2013-11-29Graham BloiceJörg Mayer1-0/+9
Ensure we use the correct value for MSC_VER_REQUIRED (similar to nmake build) svn path=/trunk/; revision=53656
2013-11-29Graham Bloice:Jörg Mayer1-0/+3
Always include the "true" zlib includes first. This works around a bug in the Windows setup of GTK[23] which has a faulty zconf.h. svn path=/trunk/; revision=53647
2013-11-24According toGuy Harris1-1/+0
http://gcc.gnu.org/onlinedocs/gcc-4.8.2/gcc/Code-Gen-Options.html#Code-Gen-Options -ftrapv "generates traps for signed overflow on addition, subtraction, multiplication operations." and -fwrapv "instructs the compiler to assume that signed arithmetic overflow of addition, subtraction and multiplication wraps around using twos-complement representation." Those seem mutually-exclusive to me, and we probably want wrapping, not traps, as there's probably a fair bit of code out there that explicitly or implicitly assumes wrapping. (Actually, we really want to avoid signed arithmetic for the cases that most matter, such as offsets and lengths, but, unfortunately, we currently have API conventions that allow negative values for lengths, either with -1 meaning "to the end" or with negative values meaning "relative to the end".) In addition, there seem to be some bugs complaining that -ftrapv doesn't always cause traps on signed integer overflow. We seem to be seeing crashes in Lemon on the Solaris buildbot subsequent to adding -ftrapv; I don't know whether that's an overflow being detected, a bug in the compiler, or something unrelated, especially given that we're using Sun C, not GCC, on the Solaris buildbot. However, we'll try removing -ftrapv, to see if it fixes the problem; the MIT CSAIL paper in question wasn't really recommending all the GCC options it mentioned (which, as noted, wouldn't make sense, as -ftrapv and -fwrapv appear to be mutually-exclusive). svn path=/trunk/; revision=53556
2013-11-24Use GCC flags to avoid optimization problems due to undefined behaviourBalint Reczey1-0/+4
Adding flags suggested by article at: http://pdos.csail.mit.edu/~xi/papers/stack-sosp13.pdf svn path=/trunk/; revision=53551
2013-11-22Add -Wheader-guard to Autotools and CMakeAlexis La Goutte1-0/+1
svn path=/trunk/; revision=53507
2013-11-18Beginnings of CheckAPI support. More diligence neededJörg Mayer1-0/+5
(need to seperate generated files into their own variables). svn path=/trunk/; revision=53407
2013-11-17Fix indent (use tabs)Alexis La Goutte1-121/+120
svn path=/trunk/; revision=53390
2013-11-17Move the epan/filesystem.c routines to wsutil; they're not specific toGuy Harris1-1/+0
packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-11-09No need to check whether cmake_policy command exists as we requireJörg Mayer1-5/+14
cmake 2.6. Add two more policy statements to avoid warnings on current cmake systems. CMP0020 doesn't work - no idea why. svn path=/trunk/; revision=53180
2013-11-07Turn WANT_PACKET_EDITOR into an option until such a time thatJörg Mayer1-2/+0
it isn't a compile time option any more. svn path=/trunk/; revision=53147
2013-11-07Add WANT_PACKET_EDITOR to CMakeAlexis La Goutte1-0/+1
svn path=/trunk/; revision=53133
2013-11-04- Reenable /LARGEADDRESSAWARE on Windows platformJörg Mayer1-6/+14
- Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info), print the choice. This will pick up the previously used flags LINK_FLAGS and CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed by _<build-type> - Remove Optimization (-O2) and debug (-g) flags from list of default flags as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc. NOTE: This also needs to be done for the Windows flags, I just don't have a Win system to test on right now. svn path=/trunk/; revision=53083
2013-11-03Pass the name of the sed executable as an explicit argurment toJörg Mayer1-1/+1
runlex.sh (like it is done with LEX already). May fix a problem on Windows with cmake. svn path=/trunk/; revision=53059
2013-10-29Make it so out-of-tree builds (autofoo and cmake) have access to the variousJeff Morriss1-0/+2
data files (diameter/*, COPYING, manuf) when running *shark from the build directory. Do this by passing in the top-level source directory as a compile-time definition (unfortunately this has to be in the top-level Makefile too because some programs link directly with epan/filesystem.c). The plugins dir is no longer below the datafile directory but rather the progfile directory (if we have one). Handle the special case of AUTHORS-SHORT (a data file but a generated one) by checking the file name before building the path. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664 svn path=/trunk/; revision=52940
2013-10-27Add Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location.Gerald Combs1-1/+1
svn path=/trunk/; revision=52895
2013-10-16If we're using Clang add -Qunused-arguments in order to avoid a bunchGerald Combs1-2/+6
of warnings described at http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html svn path=/trunk/; revision=52646
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice1-0/+18
using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-10-12Remove some things that I added while not understanding the realJörg Mayer1-3/+4
problem/solution. "Long" since solved by copying the solution from Makefile.nmake. Small update to the status of cmake builds on windows svn path=/trunk/; revision=52574
2013-10-11With Gerald's patch we should no longer require GTK includes for QT-Only buildsJörg Mayer1-10/+0
(untested). svn path=/trunk/; revision=52555
2013-10-11The env variable is QT5_BASE_DIR, as documented in README.cmakeJörg Mayer1-1/+1
Make documentation and implementatoin consistent svn path=/trunk/; revision=52541
2013-10-11The path for the Qt5 installation now needs to be set as aJörg Mayer1-1/+1
windows environment variable. svn path=/trunk/; revision=52540
2013-10-11qtshark and wireshark(gtk2) now actually find their libs.Jörg Mayer1-5/+4
svn path=/trunk/; revision=52539
2013-10-11Now the GUI programs (wireshark/gtk2 and qtshark) compile and linkJörg Mayer1-4/+9
svn path=/trunk/; revision=52538
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-23 02:02:31 +0000