commit 561460160a
Author: Graham Bloice <graham.bloice@trihedral.com>
Date: Fri May 16 20:43:17 2014 +0100
Update CMake build for win32 to build QT again, and to find
GLib and GThread libs
Fix that (basically it put them into the packagelist which got
*replaced* by the next set of things to test).
Change-Id: I0f43a17a7c7eb087c530f6336dc61f93b121fda8
Reviewed-on: https://code.wireshark.org/review/2035
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
It is helpful to find and build this optional dependance.
Change-Id: I73d7a7bb730778bc8b9a54d6560f7f42f1e23bc0
Reviewed-on: https://code.wireshark.org/review/1876
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
cmake version to be 2.8.3. Make this explicit.
commit 5ff629ec5a
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Thu May 22 22:05:08 2014 +0200
CMake: Remove FeatureSummary.cmake and fix display of feature
Change-Id: If6f67c837f1bee92a22bbff8965baa3cc71bf663
Reviewed-on: https://code.wireshark.org/review/1841
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Change-Id: Ie23faaeeab61c684d57c4ff7b3c1b4ff95906dbe
Reviewed-on: https://code.wireshark.org/review/1706
Reviewed-by: Michael Mann <mmann78@netscape.net>
If you think not finding a package that the user specifies should be
used should be an error, please fix bug 10074 first - not finding a
package that the user *didn't* specify should be used or shouldn't be
used should not be an error.
Change-Id: I62aba4309e227352e114f2d291aaa74dba78840f
Reviewed-on: https://code.wireshark.org/review/1498
Reviewed-by: Guy Harris <guy@alum.mit.edu>
When setting the XXX_REQUIRED variables, set them to TRUE.
Change-Id: I1591ffe221e15d65cb64516a45e9dc8461051373
Reviewed-on: https://code.wireshark.org/review/1497
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Before this change the code using make package was just showing
a string ${PACKAGE_VAR}_FOUND instead of showing if the
${PACKAGE_VAR}_FOUND variable was set true by find_package function.
Now the user will be informed about which packages were not found
and an error will be raised, as packages sought are the ones that
are selected for the build.
This change also ads fixes to some improper PACKAGE_VAR
variables that prevented find_package from finding
proper packages.
Change-Id: Ic20bc50ace65bab385059a7430909f95367520a3
Reviewed-on: https://code.wireshark.org/review/1410
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Use GTK2 as per nmake.
Not to build the dumpabi executables.
Change-Id: Ia28cf1a80b81e10595f4af5bbd46da3b3675faf5
Reviewed-on: https://code.wireshark.org/review/1376
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This matches the current name of the --enable-extra-compiler-warnings
option in autotools.
Fix the documentation of the option to match.
(Note that "compiler" won't necessarily always be GCC or Clang, and
won't necessarily always use -W for warning options, so speaking of them
as "-W checks" isn't future-proof.)
Change-Id: I2e142532e78be3c8051f1e738b3109a83e7d10dc
Reviewed-on: https://code.wireshark.org/review/1231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It no longer does anything, and it refers to variables that no longer
exist, as we're not distinguishing between extra GCC warning flags and
extra CLang warning flags any more.
Change-Id: If0b346f669f2573e46261e6da4dc78e96ef79a8f
Reviewed-on: https://code.wireshark.org/review/1228
Reviewed-by: Guy Harris <guy@alum.mit.edu>
We test whether a given compiler supports a given -W flag, so we don't
need to separate them and check them only for particular compilers.
To make that even clearer, rename the --enable option from
--enable-extra-gcc-checks to --enable-extra-compiler-checks, and
document it as just "do additional -W checks", and rename the
WIRESHARK_EXTRA_GCC_ CMake variables to WIRESHARK_EXTRA_COMPILER_.
Sync up the lists of warning flags in CMake with the lists in autoconf.
Uncomment -Wdocumentation while we're at it. If it doesn't work *at
all*, comment it out until it's fixed, or, better yet, fix it; if it
still produces warnings, we just leave it among the "extra" flags.
Change-Id: I4042affdade612e4025e2881d08f1ca69d759626
Reviewed-on: https://code.wireshark.org/review/1226
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This change makes CMAKE_VERBOSE_MAKEFILE option
of CMake used to determine verbosity of generated
makefile, instead of hardcoding it in CMakeLists.txt
script and forcing user to read the script and use
workarounds like "make VERBOSE=1"
Change-Id: I0f3b90ccf962ff88fbfa21ad2f3920b1644d6b6e
Reviewed-on: https://code.wireshark.org/review/1002
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Use setting WERROR and WERR_UNKNOWN explicitly to
FALSE instead using unset command. This ensures that
no if(WERROR) or if(WERR_UNKNOWN) clause will trigger
unless these variables are set to another value.
Change-Id: I752d7691c9c101b07c6ee85db83d96d9190bccd7
Reviewed-on: https://code.wireshark.org/review/1001
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)
Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
With -Wunreachable-code flags (and disable for the moment -Wdocumentation)
Change-Id: I126c962b32e650a63b78092e95896736ae7335c9
Reviewed-on: https://code.wireshark.org/review/678
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
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>
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>
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
- 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
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
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
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
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
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
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
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