The data contained in this repository can be downloaded to your computer using one of several clients.
Please see the documentation of your version control software client for more information.

Please select the desired protocol below to get the URL.

This URL has Read-Only access.

Statistics
| Branch: | Revision:

main_repo / CMakeLists.txt @ master

History | View | Annotate | Download (41.6 KB)

# Date Author Comment
06565a74 08/22/2014 06:04 PM Graham Bloice

Add WinSparkle to the CMake build to bring it into line with
the nmake build

Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c
Reviewed-on: https://code.wireshark.org/review/3755
Reviewed-by: Graham Bloice <>

ff94a7ff 08/22/2014 06:55 AM Joerg Mayer

Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done with
other liberaries. Also: After set( variable 0 ) the variable is defined.

Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0
Reviewed-on: https://code.wireshark.org/review/3793
Reviewed-by: Jörg Mayer <>

bed29af4 08/20/2014 11:34 PM Roland Knall

Extcap Capture Interface

Extcap is a plugin interface, which allows for the usage
of external capture interfaces via pipes using a predefined
configuration language which results in a graphical gui.
This implementation seeks for a generic implementation,...
4ac0438e 08/20/2014 03:25 PM Graham Bloice

In Visual Studio builds, enable the L4 warning
4189: Local variable is initialized but not referenced

Fix some variables found by this

Change-Id: Icc13def5413f1fe885ec25e659462c8906a6cfa0
Reviewed-on: https://code.wireshark.org/review/3748
Reviewed-by: Graham Bloice <>...

4388b560 08/13/2014 08:49 PM Gerald Combs

CMake: More Qt5WinExtras plumbing.

Change-Id: I7474e8373668ba554d3574193fec59daceafe00d
Reviewed-on: https://code.wireshark.org/review/3588
Reviewed-by: Gerald Combs <>

e3978271 08/13/2014 07:00 PM Gerald Combs

Windows Qt: Add taskbar progress support

Add support for the taskbar progress indicator on Windows via
QtWinExtras. It is almost as if we're a grown up Windows application.

Change-Id: I378206b49510d4bd08f2437d8e9a1b01bc6f1351
Reviewed-on: https://code.wireshark.org/review/3576...

1dc88edc 08/07/2014 04:56 PM Joerg Mayer

Add back a comment lost in 8b2a8a9636d090

Change-Id: I7bdd4767bdffdc23b964898085a216f6ef7c8aff
Reviewed-on: https://code.wireshark.org/review/3474
Reviewed-by: Jörg Mayer <>

8b2a8a96 08/05/2014 08:33 AM Graham Bloice

Suppress 10 of the CMP0020 CMake warnings on Windows, only 8 left now.

Change-Id: I2f85529728e0346b8c4888cd1c23e86a306cc613
Reviewed-on: https://code.wireshark.org/review/3430
Reviewed-by: Graham Bloice <>

37b5b095 08/04/2014 10:31 AM Evan Huus

Rip out the filetap code

We decided at sharkfest that this wasn't the right design for file dissection;
we have more-or-less settled on way forward, but nobody's shown interest in
implementing it. Whether or not that ever happens, this code is effectively...

da5dd183 08/04/2014 02:39 AM Guy Harris

CMake 2.8+ supports CMAKE_OSX_DEPLOYMENT_TARGET; don't do that stuff ourselves.

Do, however, do the "for a target of 10.4 or 10.5, build 32-bit only"
stuff, as that's specific to programs that capture traffic, such as
Wireshark (well, I guess we could just limit it to dumpcap, but...)....

2d126cfe 08/03/2014 04:08 PM Guy Harris

Add an OSX_DEPLOY_TARGET option to control building for a target OS version.

It should be set to an OS version, such as "10.5" or "10.6" or..., and,
if set (and if you're building for "APPLE"), it'll try to find the SDK
(and fail if it's not found), and add appropriate -isysroot,...

53957d84 08/03/2014 02:30 PM Guy Harris

Go back to non-verbose Makefiles.

(The difference in question turned out to be that optimization wasn't
turned on for autotools builds but was turned on for CMake builds.
Comparing the compiler options also found some other differences that
should be cleaned up.)...

7df03a7c 08/03/2014 06:41 AM Guy Harris

Get rid of debugging output, and get CMake to produce verbose makefiles.

On the 32-bit OS X buildbot, automake is old enough that autotools
builds are verbose, printing the command line for each compile step; if
we cause CMake to produce verbose makefiles, they will also print the...

363f1e56 08/02/2014 09:34 PM Guy Harris

Print the actual compiler, not its "CMake-id".

Hopefully this will help figure out whether we're using different
compilers for the autotools and CMake builds.

Change-Id: If6d2ee93cd14570c53723140dcedf347600cbe34
Reviewed-on: https://code.wireshark.org/review/3375...

5234d4c2 08/02/2014 08:47 PM Guy Harris

OK, try sorting the compiler options.

Also, comment out the addition of -Wno-deprecated-declarations, as the
CMake build doesn't use it.

If this succeeds in making the autotools and CMake builds compile C code
with the same -W and -f flags in the same order, that should eliminate...

2dd26909 08/02/2014 07:27 PM Guy Harris

Note that the ...COMMON_FLAGS are for C and C++.

Change-Id: I0ef87b3b4aaed984a8a53660b36746345626583a
Reviewed-on: https://code.wireshark.org/review/3373
Reviewed-by: Guy Harris <>

55646c84 08/02/2014 06:46 PM Guy Harris

Always check some -f flags.

Now that we check each flag with all previously-accepted flags, this
catches the case where -fwrapv causes -fno-strict-overflow to produce a
warning when tested.

This way, what we do matches what the autotools do.

Change-Id: I68ce281dc33a32b591e3137db626f2749c4a0708...

e2969cbb 08/02/2014 06:44 PM Guy Harris

When testing compiler flags, test them with previously-tested flags.

That mirrors what we're doing with autotools, and catches cases where
an earlier-tested flag affects the results for a later-tested flag
(e.g., -fwrapv can affect whether -fno-strict-overflow produces a...

50b67345 08/02/2014 05:01 PM Guy Harris

Dump additional debugging information.

For autotools, dump CC, CFLAGS, CXX, and CXXFLAGS.

For CMake, dump CMAKE_C_COMPILER_ID and CMAKE_CXX_COMPILER_ID.

Hopefully this will help figure out why CMake builds catch different
warnings from autotools builds....

493c4c20 08/02/2014 04:54 PM Guy Harris

Wait until the C and C++ compiler flags are fully set before showing them.

That way, we report the full contents of those flags.

Change-Id: Idab78049247c04b7d35a3ce804c8ea9daaf84312
Reviewed-on: https://code.wireshark.org/review/3364
Reviewed-by: Guy Harris <>

44d30ece 08/01/2014 11:37 AM Jeff Morriss

cmake: forget about plugins/asn1: it's not used any more.

(Don't load plugins/asn1/plugin.rc.in)

Change-Id: I621552a7e915396f61c5bb450a99d4e575ac30df
Reviewed-on: https://code.wireshark.org/review/3324
Reviewed-by: Jeff Morriss <>

435e7c61 07/31/2014 08:30 PM Guy Harris

Move the AirPcap stuff into caputils.

Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8
Reviewed-on: https://code.wireshark.org/review/3308
Reviewed-by: Guy Harris <>

1ebfb3fc 07/31/2014 05:17 PM Guy Harris

Distinguish between wireshark source files and wireshark dependencies.

Only the former should be run through checkAPI.pl; Windows .rc files,
for example, shouldn't.

Change-Id: I948705b4020b413834c37a0d685eedcb747aa237
Reviewed-on: https://code.wireshark.org/review/3303...

cb960993 07/31/2014 05:00 PM Guy Harris

Lua - it's not just for breakfast^Wdissectors any more!

Change-Id: I7cefdec10a2fdd47f8a50ab5a45002662cc14f3c
Reviewed-on: https://code.wireshark.org/review/3302
Reviewed-by: Guy Harris <>

482dcf8c 07/30/2014 12:39 PM Joerg Mayer

Remove empty variable SHARK_COMMON_CAPTURE_SRC. It's not present
for the other build systems as well.
Small whitespace fix.

Change-Id: I071ee4ae0fa85306435d2d82d36265973181b71c
Reviewed-on: https://code.wireshark.org/review/3263
Reviewed-by: Jörg Mayer <>

fae3615c 07/15/2014 09:27 PM Guy Harris

Move the monitor-for-interface-list-changes stuff to the caputils library.

Change-Id: Ie0d4504688602c2aa8e9788643b079930ca7d305
Reviewed-on: https://code.wireshark.org/review/3076
Reviewed-by: Guy Harris <>

6b898e6b 07/11/2014 06:22 PM Gerald Combs

Add back -Qunused-arguments for Clang++.

When used with ccache it can result in warnings as described at
http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.

Change-Id: Ibca4fd262ec8d1f16a450b1698ead10f57d52b06
Reviewed-on: https://code.wireshark.org/review/3015...

2cb5937e 07/09/2014 03:29 PM Alexis La Goutte

CMake : fix name of HTML Viewer to display also the exe path

Change-Id: Id103ced59e0ae7e2cff272604f4cfe11d47fe957
Reviewed-on: https://code.wireshark.org/review/2950
Reviewed-by: Evan Huus <>

9e6487f2 07/04/2014 03:25 AM Guy Harris

Move utility routines for capturing into a libcaputils static library.

Some of those routines are used only in dumpcap; others are used in
TShark and Wireshark as well.

Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7
Reviewed-on: https://code.wireshark.org/review/2841...

06bd8045 07/03/2014 01:16 PM Guy Harris

Make wsutil depend on gitversion.

wsutil contains the only code that uses version.h; make the dependency
explicit, to see whether that fixes the current build issues with Debian
packaging.

Also, get rid of all other dependencies on gitversion.

Change-Id: I89fa5e4112633b83a1a7dfa349bc337e3688575f...

edc67362 07/03/2014 05:09 AM Guy Harris

Add --help and --version support.

Make the output for them resemble the output for other programs.

Change-Id: I45dbee32ad403b8fedc2350ac9096ac1a5820cbe
Reviewed-on: https://code.wireshark.org/review/2799
Reviewed-by: Guy Harris <>

b4ce3525 07/03/2014 04:46 AM Guy Harris

Make --help and --version information a bit more uniform.

Have --version print the version number, the copyright information, the
"compiled with" information, the "running on/with" information, and the
compiler information.

Have --help print the version number, a one-line summary of what the...

0041f360 07/02/2014 11:57 AM Joerg Mayer

Make the flag testing logic for linker flags work like the compiler flag testing.

Change-Id: I2478417cbcd395247215f149978c5f0c874c9b3a
Reviewed-on: https://code.wireshark.org/review/2779
Reviewed-by: Jörg Mayer <>

65e3f5c2 07/02/2014 09:53 AM Balint Reczey

Allow overriding C/C++ flags from CMake command line

Append user's flags to our flags instead of prepending them to make
user flags higher priority.

Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2
Reviewed-on: https://code.wireshark.org/review/2722...

98d8dec6 07/01/2014 09:02 PM Guy Harris

See if this forces version.h to be built.

(It's not being built by the Ubuntu buildboth when it's building the
Debian package.)

Change-Id: Id7866e13ce72cdda4bb7d5cf0362ba7295ff766b
Reviewed-on: https://code.wireshark.org/review/2772
Reviewed-by: Guy Harris <>

4cdfc5c0 07/01/2014 08:35 PM Guy Harris

AUTHORS-SHORT is build in ${CMAKE_BINARY_DIR}, not ${CMAKE_SOURCE_DIR}.

Make the dependencies list indicate that.

Change-Id: I88416e1239130b7661bbd9deccfb289e0b0fd627
Reviewed-on: https://code.wireshark.org/review/2770
Reviewed-by: Guy Harris <>

eb239946 07/01/2014 02:22 AM Joerg Mayer

Generate version.h before adding subdirs (especially wsutil). Otherwise
build could fail in wsutil because of missing version.h

Change-Id: If6fdf1080c6de9ca1581bcc126506e78ec03a1d8
Reviewed-on: https://code.wireshark.org/review/2740
Reviewed-by: Jörg Mayer <>

94e6bbeb 06/30/2014 10:24 PM Joerg Mayer

Put each option on a line of its own.

Change-Id: Ibec60300306e8af7ee230080b113111f93d850dc
Reviewed-on: https://code.wireshark.org/review/2739
Reviewed-by: Jörg Mayer <>

bb6f5eae 06/30/2014 07:20 PM Guy Harris

Reflect the move of filters.c to libui.

Change-Id: Ic1099927e3fb63c020c622e0a92e99a376908f4e
Reviewed-on: https://code.wireshark.org/review/2737
Reviewed-by: Guy Harris <>

60d0faf9 06/30/2014 05:08 PM Guy Harris

Move proto_hier_stats.[ch] to libui.

Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8
Reviewed-on: https://code.wireshark.org/review/2725
Reviewed-by: Guy Harris <>

ad1391aa 06/30/2014 01:38 AM Guy Harris

Move capture.[ch] to libui.

Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0
Reviewed-on: https://code.wireshark.org/review/2711
Reviewed-by: Guy Harris <>

df583372 06/29/2014 09:36 PM Guy Harris

Move capture_ui_utils.[ch] to libui.

Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a
Reviewed-on: https://code.wireshark.org/review/2708
Reviewed-by: Guy Harris <>

fe42762f 06/29/2014 07:03 PM Guy Harris

Move some more stuff into wsutil.

Move the routines to parse numerical command-line arguments there.

Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just
call routines specified by a call to cmdarg_err_init(), and have
programs supply the appropriate routines to it....

4742fc8e 06/26/2014 05:34 PM Graham Bloice

Fixed linker flags for MSVC to not attempt to make and link a manifest
Added solution "folder" for tests.

Change-Id: I96dfb4a28fb7aaf3e84cea026e1f5d15afe6c0c6
Reviewed-on: https://code.wireshark.org/review/2635
Tested-by: Graham Bloice <>...

e978cad6 06/23/2014 11:28 PM Joerg Mayer

Create capchild/doxygen.cfg

Change-Id: I215a9d9849c752f9e8e3216c0f6479d1ba1cfafd
Reviewed-on: https://code.wireshark.org/review/2608
Reviewed-by: Jörg Mayer <>

213189ef 06/23/2014 07:58 PM Guy Harris

Move the routines to talk to dumpcap into a static libcapchild.

This pulls some stuff out of the top-level directory, and means we don't
have to build them once for every program using them.

Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5
Reviewed-on: https://code.wireshark.org/review/2591...

3c979e63 06/21/2014 04:36 PM Joerg Mayer

Reorder some statements to avoid unused build-type directories
Change-Id: I4209eff78faa619030d3cacdc759fd143a238247
Reviewed-on: https://code.wireshark.org/review/2526
Reviewed-by: Jörg Mayer <>

a1112249 06/21/2014 02:02 PM Guy Harris

Move get_os_version_info() to libwsutil.

This mean we also have to move CFString_to_C_string() there for OS X.

Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337
Reviewed-on: https://code.wireshark.org/review/2511
Reviewed-by: Guy Harris <>

c11ae8ac 06/20/2014 07:58 PM Joerg Mayer

Add .rc files to the sources to have them included in the build
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee
Reviewed-on: https://code.wireshark.org/review/2506
Reviewed-by: Jörg Mayer <>

5d65e022 06/20/2014 07:05 PM Joerg Mayer

More .in files to handle

Change-Id: I55a04fe6f72c22f1a936ef45b215a8813f7a02db
Reviewed-on: https://code.wireshark.org/review/2502
Reviewed-by: Jörg Mayer <>

fd8bf421 06/20/2014 06:39 PM Joerg Mayer

Process all .in files, not only the ones needed for Unix'ish systems.

Change-Id: I265367f07253be4379efbb6689ec944f04ef6134
Reviewed-on: https://code.wireshark.org/review/2500
Reviewed-by: Jörg Mayer <>

dc5d0ed0 06/20/2014 06:05 PM Graham Bloice

Add flags required for VS2013 to Cmake

Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4
Reviewed-on: https://code.wireshark.org/review/2499
Reviewed-by: Graham Bloice <>
Tested-by: Graham Bloice <>

72078cfc 06/18/2014 03:28 PM Joerg Mayer

Undo more of Graham's changes:
- We don't expect to find all packages and it is normally OK for
some to fail.

Change-Id: I46c5edbf8ea3635fd703b222d4a9beb5ebb4745a
Reviewed-on: https://code.wireshark.org/review/2406
Reviewed-by: Jörg Mayer <>

ff5c9684 06/18/2014 03:27 PM Guy Harris

Only check for -msse4.2.

We don't care about instruction set extensions other than SSE 4.2, just
check for that.

Do so on all compilers other than MSVC.

Change-Id: I227c31715aab6df0e020d6bc3e3aa41e1bc5cb7e
Reviewed-on: https://code.wireshark.org/review/2405...

8dabe002 06/18/2014 02:58 PM Guy Harris

We don't need -Qunused-arguments with Clang

check_c_compiler_flag now checks for the message Clang prints for f and
-m flags it doesn't handle ("argument unused during compilation:
'
{flag}'"), so the checks for it now should fail properly during
testing, causing us not to use the flag in question. This means we...

c6007e8d 06/18/2014 02:55 PM Guy Harris

We don't need -Werror=unknown-warning-option with Clang.

check_c_compiler_flag checks for the message Clang prints for an unknown
warning option ("unknown warning option '-WXXX'"), and fails if it's
produced, so we don't need to force the compiler to fail by passing it...

77e34736 06/18/2014 02:31 PM Guy Harris

Do C-Flags and CXX-Flags the same way.

It looks weird to have "-- " before C-Flags but not CXX-Flags.

Change-Id: I95f309b60a45cbd4477c8ed6187b198ab9bac9d8
Reviewed-on: https://code.wireshark.org/review/2398
Reviewed-by: Guy Harris <>

289aa37d 06/16/2014 08:44 PM Joerg Mayer

Remove detection of Python libraries: They are not used anymore.

Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950
Reviewed-on: https://code.wireshark.org/review/2290
Reviewed-by: Jörg Mayer <>

f113306e 06/16/2014 07:14 PM Jeff Morriss

More Python-bindings removal.

Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce
Reviewed-on: https://code.wireshark.org/review/2283
Reviewed-by: Jeff Morriss <>

67a924be 06/16/2014 03:15 PM Joerg Mayer

The visibility warning is only valid on non-msvc platforms

Change-Id: Iec90ac8654d08b63cfda7d14c370f3c800c74038
Reviewed-on: https://code.wireshark.org/review/2263
Reviewed-by: Jörg Mayer <>

4c261cf6 06/14/2014 10:34 AM Joerg Mayer

Policy CMP020 was being set twice. Remove my original clumsy implementation.
Set CMP0015 to NEW

Change-Id: Idea76f365f27e59eb6f56c7edec6d96224668c0d
Reviewed-on: https://code.wireshark.org/review/2219
Reviewed-by: Jörg Mayer <>

30480da8 06/14/2014 04:49 AM Joerg Mayer

Match for contents of WIRESHARK_SIMD_FLAGS only if non-empty

Change-Id: I99e15b237c74783b455461ce58ba32f1f8202990
Reviewed-on: https://code.wireshark.org/review/2208
Reviewed-by: Jörg Mayer <>

93528031 06/14/2014 02:44 AM Joerg Mayer

Backport autofoo simd optimization

Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6
Reviewed-on: https://code.wireshark.org/review/2206
Reviewed-by: Jörg Mayer <>

21b08ba8 06/14/2014 02:42 AM Joerg Mayer

Rename WIRESHARK_C_FLAGS to WIRESHARK_COMMON_FLAGS

Change-Id: If78801de797264c0924e81abaf8cd49cc5715a83
Reviewed-on: https://code.wireshark.org/review/2204
Reviewed-by: Jörg Mayer <>

9b499109 06/08/2014 10:36 AM Joerg Mayer

Linking against libgettext and libm got broken by

commit 561460160a4ae73bda9b92751ae5c35d4324bb87
Author: Graham Bloice &lt;&gt;
Date: Fri May 16 20:43:17 2014 +0100
Update CMake build for win32 to build QT again, and to find...
56146016 06/08/2014 08:13 AM Graham Bloice

Update CMake build for win32 to build QT again, and to find
GLib and GThread libs

Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
Reviewed-on: https://code.wireshark.org/review/2010
Reviewed-by: Graham Bloice <>
Tested-by: Graham Bloice <>...

c04b5292 05/30/2014 09:59 AM Michal Labedzki

cmake: Add feature info for SBC

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 <>

7c1171f7 05/30/2014 09:36 AM Balint Reczey

Fix wireshark.pc install destination

Change-Id: I136d654ac5ea54237494d9b61c3ddb445b0720ae
Reviewed-on: https://code.wireshark.org/review/1863
Reviewed-by: Alexis La Goutte <>

7bf49b31 05/30/2014 08:48 AM Balint Reczey

Set PLUGIN_INSTALL_DIR properly for wireshark.pc

Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747
Reviewed-on: https://code.wireshark.org/review/1861
Reviewed-by: Alexis La Goutte <>

6dabe124 05/28/2014 11:15 AM Joerg Mayer

Commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f requires the minimum
cmake version to be 2.8.3. Make this explicit.

commit 5ff629ec5ac636b901b2a004aa4d5248f68a5d0f
Author: Alexis La Goutte &lt;&gt;
Date: Thu May 22 22:05:08 2014 +0200...
5ff629ec 05/27/2014 07:20 AM Alexis La Goutte

CMake: Remove FeatureSummary.cmake and fix display of feature

Bug:8819

Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934
Reviewed-on: https://code.wireshark.org/review/1728
Reviewed-by: Alexis La Goutte <>

ca97ba0f 05/23/2014 03:23 AM Alexis La Goutte

Update comment about -Wunreachable-code and -Wdocumentation

Change-Id: I5b942bdacc5f4a9ecfa084dbff479eba6582b0df
Reviewed-on: https://code.wireshark.org/review/1726
Reviewed-by: Anders Broman <>

2b0ad540 05/20/2014 10:06 PM Alexis La Goutte

Fix indent (use tabs)

Change-Id: Ie23faaeeab61c684d57c4ff7b3c1b4ff95906dbe
Reviewed-on: https://code.wireshark.org/review/1706
Reviewed-by: Michael Mann <>

8f2f7275 05/04/2014 11:12 PM Guy Harris

Not finding a non-required package is NOT an error!

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...

0b0c98a0 05/04/2014 11:07 PM Guy Harris

set(<variable>) undefines the variable; a value must be specified.

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 <>

fbd3c937 05/01/2014 08:12 AM Michał Orynicz

Fix procedure of finding packages

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...

14017dc6 04/29/2014 12:25 AM Graham Bloice

Set CMake defaults for Windows build to:
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 <>...

fde8ef07 04/20/2014 07:54 PM Guy Harris

Rename ENABLE_EXTRA_COMPILER_CHECKS to ENABLE_EXTRA_COMPILER_WARNINGS.

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...

f456a6e0 04/20/2014 07:22 PM Guy Harris

Get rid of ENABLE_EXTRA_CLANG_CHECKS.

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...

68f9811b 04/20/2014 06:47 PM Guy Harris

Don't distinguish between "GCC" and "Clang" extra -W flags.

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...

412c6cab 04/09/2014 04:00 AM Michał Orynicz

Make makefile verbosity configurable from CMake

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"...

3057e309 04/09/2014 03:54 AM Michał Orynicz

Change how WERROR and WERR_UNKNOWN is turned off

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....

757aa332 03/31/2014 02:48 PM Alexis La Goutte

Continue to remove $Id$ from top of file

(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 <>

280c2958 03/31/2014 04:29 AM Alexis La Goutte

Add --enable-extra-clang-checks for autotools and CMakeList
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 <>

d43f7d13 03/17/2014 10:32 AM Alexis La Goutte

Remove -Wunreachable-code it is removed from GCC

http://gcc.gnu.org/ml/gcc-help/2011-05/msg00360.html

Change-Id: I3f016611d0dc5e7cc6d53965f9b5d2b1ee88fe1c
Reviewed-on: https://code.wireshark.org/review/677
Reviewed-by: Hadriel Kaplan <>...

ff6cc9b0 03/08/2014 06:55 PM Balint Reczey

Add pkg-config file

Change-Id: Ia55a2e560aef8d2f9a3cede18af4555507656047
Reviewed-on: https://code.wireshark.org/review/500
Reviewed-by: Evan Huus <>
Tested-by: Balint Reczey <>
Reviewed-by: Balint Reczey <>

1fd434e4 02/20/2014 01:24 PM Michal Labedzki

Add missing SBC library to cmake build

Change-Id: I4eb2dacc196b8feef62ff633322c53c04f78fc92
Reviewed-on: https://code.wireshark.org/review/252
Reviewed-by: Michal Orynicz <>
Reviewed-by: Alexis La Goutte <>...

5e27a39f 02/17/2014 04:44 PM Michal Labedzki

Add Bluetooth SBC Codec support in cmake

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...

b24339e2 02/14/2014 03:58 PM Evan Huus

Disable tfshark taps for now.

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 <>...

f9669809 02/07/2014 06:03 PM Gerald Combs

Replace "svn" with "git" all over the place.

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`...

88a205d5 01/18/2014 08:08 PM Jörg Mayer

Error doesn't exist, use warning instead.

svn path=/trunk/; revision=54841

2a21b01f 01/18/2014 07:48 PM Jörg Mayer

Add option to specify special permissions for dumpcap during cmake phase:
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...

5783452a 01/18/2014 05:52 PM Jörg Mayer

-Warray-bounds was listed twice

svn path=/trunk/; revision=54839

02b9cbb5 01/09/2014 06:02 AM Jörg Mayer

Move cfile.c into SHARK_COMMON_SRC (as was done in nmake)

svn path=/trunk/; revision=54678

2203d515 01/08/2014 05:02 PM Jörg Mayer

make tfshark finally compile:
- 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

8c916394 01/08/2014 03:57 PM Guy Harris

TFShark doesn't capture traffic, so it doesn't need
SHARK_COMMON_CAPTURE_SRC.

svn path=/trunk/; revision=54672

c81a43da 01/08/2014 03:36 PM Guy Harris

At least some of the files in PLATFORM_CAPTURE_SRC are needed by
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

005ff3f6 01/08/2014 03:10 PM Guy Harris

Rename WIRESHARK_COMMON_SRC to SHARK_COMMON_SRC - what's common about it
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...

bf284da2 01/07/2014 11:35 PM Michael Mann

TFShark (Terminal Fileshark) v.001. Bug 9607 (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)...

25f66df3 01/07/2014 06:08 PM Jörg Mayer

Rework compiler flag detection to be able to handle changed
order of flags

svn path=/trunk/; revision=54638