aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-10-11Back out the verbose Makefile stuff.Guy Harris1-7/+0
I give up. I don't know whether this all means our build mechanism is too fragile, our code is to fragile, autotools are too fragile, the compilers we're using are too fragile, Qt is too fragile, or C++ is too fragile, but if the build breaks that easily, maybe we should just give up on Leopard. Change-Id: If700d928da95d09ed5173b976261e4ddd236d654 Reviewed-on: https://code.wireshark.org/review/10946 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11Temporarily make cmake builds verbose, for debugging purposes.Guy Harris1-0/+7
Try to figure out why CMake builds work on the 32-bit OS X buildbot but autotools builds don't; either the compiler commands are different in ways that break the autotools build, or the config.h files are different in ways that break the autotools build, or magic pixies affect the builds in different ways that only break the autotools build. Change-Id: Id24bad04ff8ef755e4966e28fd445c2ab05c6913 Reviewed-on: https://code.wireshark.org/review/10931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-05Initialize 2.1.Gerald Combs1-3/+3
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Allow use of variadic macrosPeter Wu1-0/+1
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Revert "CMake: Don't feed -fPIC to Visual C++."Gerald Combs1-2/+1
This doesn't appear to fix the issue unfortunately. This reverts commit fd5eafa50a77bc319a240727600be38307e54f86. Change-Id: Ida25881fca0a667c7d47692465b8f1fc9d335697 Reviewed-on: https://code.wireshark.org/review/10753 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02Qt: Initial RTP playback.Gerald Combs1-5/+5
Note the "initial". This is woefully incomplete. See the "to do" lists below and in the code. This differs a bit from the GTK+ version in that you specify one or more streams to be decoded. Instead of showing waveforms in individual widgets, add them all to a single QCustomPlot. This conserves screen real estate and lets us more easily take advantage of the QCP API. It also looks better IMHO. Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We probably won't use the widgets until we make 5.0 our minimum Qt version and plain old QtMultimedia lets us support Qt 4 more easily (in theory at least). Add resampling code from libspeex. I initially used this to resample each packet to match the preferred rate of our output device, but this resulted in poorer audio quality than expected. Leave it in and use to create visual samples for QCP and to match rates any time the rate changes. The latter is currently untested. Add some debugging macros. Note that both the RTP player and RTP analysis dialogs decode audio data using different code. Note that voip_calls_packet and voip_calls_init_tap appear to be dead code. To do: - Add silence frames where needed. - Implement the jitter buffer. - Implement the playback timing controls. - Tapping / scanning streams might be too slow. Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4 Bug: 9007 Reviewed-on: https://code.wireshark.org/review/10458 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02CMake: Don't feed -fPIC to Visual C++.Gerald Combs1-1/+2
Change-Id: If6dd0619052b7735d7c5eb84aadc191545df7bee Reviewed-on: https://code.wireshark.org/review/10735 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02CMake: Fix the dmg_package target.Gerald Combs1-3/+0
We don't have Wireshark.pkgproj so don't try to copy it. Change-Id: I649fce27e53cbd45ffc50e4095252a665c49165d Reviewed-on: https://code.wireshark.org/review/10739 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01Set the minimum Qt version to 4.7.Gerald Combs1-1/+1
We've been using QElapsedTimer for a while now with no complaints. It was introduced in Qt 4.7, which was first released in September 2010. Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4 Reviewed-on: https://code.wireshark.org/review/10732 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01CMake: OS X packaging updates.Gerald Combs1-8/+6
Add a dmg_package_prep target as an alias to app_bundle. Rename the osx-dmg target to dmg_package. This matches the Windows packaging target names. In osx-app.sh, make sure we rpathify the bundle plugin directory. Change-Id: If41195c9d405ad6bff865625500a8227b77e8092 Reviewed-on: https://code.wireshark.org/review/10734 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01OS X: Integrate CMake and osx-dmg.shGerald Combs1-0/+52
Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d Reviewed-on: https://code.wireshark.org/review/10694 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-25CMake: Add a hardening-check target.Gerald Combs1-0/+27
On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-25cmake: Enable PIE when it is available by defaultBalint Reczey1-0/+2
Change-Id: I88930b8a9de596f93677052b2046c1b85cc34c6b Reviewed-on: https://code.wireshark.org/review/10635 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-09-10Don't use any -fsanitize options unless we're using ASAN.Jeff Morriss1-5/+4
This lets cmake users configure without installing libusan. A better or more final fix awaits a decision in bug 11009. Change-Id: Iea6c4e2ce31817c17931a448f0c72da2a31a2e6d Ping-Bug: 11009 Reviewed-on: https://code.wireshark.org/review/10454 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-02Update comment about use of "/Zo" with MSVC2015Bill Meier1-3/+2
Change-Id: Ifb20e62a5e0719e1df2f7f6aba7a3935c7212c5b Reviewed-on: https://code.wireshark.org/review/10364 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-26cmake: rework version.h handling to treat it like config.hJoerg Mayer1-20/+10
It wasn't working on my system: I kept seeing the old git revision in '...shark -v' even after deleting version.h Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5 Reviewed-on: https://code.wireshark.org/review/10265 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-08-13Make building with MSVC2015 workAnders1-1/+10
TODO: - LUA is commented out probably needs to be built with MSVC 2015. - GeoIP is commented out, causes packet-ip* to not build. - Qt not built, needs Qt with MSVC 2015 Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55 Reviewed-on: https://code.wireshark.org/review/8683 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-04Convert Camel tap stats to new "generic stat API".Gerald Combs1-1/+0
Migrate the Camel stats similar to the recent BOOTP and H.225 migrations. Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb Reviewed-on: https://code.wireshark.org/review/9865 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Remove the CLI H.225 counter.Gerald Combs1-1/+0
Stats were moved to the dissector in g03802cc. Change-Id: I1aaf43789695ba3aae54cfaf201263cd0aed74ea Reviewed-on: https://code.wireshark.org/review/9867 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-15Revert "On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools."Guy Harris1-17/+1
This reverts commit 4a39706272a59d43530e038f8b20436e2c3052ce. At least in one quick check, CMake 2.8.12.2 added that already with Qt 5.5.0. Change-Id: Iabf0e4aa0aa34b380f981f7d039fb3d95847041e Reviewed-on: https://code.wireshark.org/review/9654 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-15On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools.Guy Harris1-1/+17
Change-Id: I281e1bf790b7eefbbd43a3406622262cfe8b36df Reviewed-on: https://code.wireshark.org/review/9651 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13The toolkit is called "Qt", not "QT".Guy Harris1-2/+2
Change-Id: If6c0c66bc429a041b3454f1f2355d4659cb17bbf Reviewed-on: https://code.wireshark.org/review/9630 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Don't add rpaths with CMake, either; osx-app.sh will do so.Guy Harris1-9/+1
Change-Id: Ie8f39e5e89ed8dc21c66ee7f1235c406c3028304 Reviewed-on: https://code.wireshark.org/review/9613 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-05Fix Windows CMake generated installer to include snmp mibsGraham Bloice1-0/+2
Wireshark.nsi requires SMI_DIR to point to the base of the SMI directory but FindSMI.cmake doesn't set it. Set it in the main CMakeLists.txt Change-Id: Id667341273d6abb0d2d64ef91cc62d1ce3f42a83 Reviewed-on: https://code.wireshark.org/review/9499 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-03Convert BOOTP/DHCP tap stats to new "generic stat API".Michael Mann1-1/+0
Change-Id: I0edc3909516452e6497a050b4617f9aafcea2688 Reviewed-on: https://code.wireshark.org/review/9112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Create very basic "generic" stat tap API to create a "GUI" independent table.Michael Mann1-1/+1
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there. Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt) Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab Reviewed-on: https://code.wireshark.org/review/9110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-23Use RTD functionality for H.225Michael Mann1-1/+0
This got missed in the initial refactoring. Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3 Reviewed-on: https://code.wireshark.org/review/9044 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22Refactor RTD stats.Michael Mann1-3/+1
Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces. Currently implemented for TShark and GTK. Affected dissectors: MEGACO, MGCP, Radius Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21 Reviewed-on: https://code.wireshark.org/review/8998 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21Further refactor SRT stats.Michael Mann1-9/+1
Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-15Fix the CMake windows installer to pickup the locally built zlib1.dllGraham Bloice1-0/+1
Change-Id: I8880a760d9817dd038694e96b4a3d9b8d2db3c2c Reviewed-on: https://code.wireshark.org/review/8931 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-15Separate Windows CMake compiler definitions and flagsGraham Bloice1-10/+15
Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238 Reviewed-on: https://code.wireshark.org/review/8926 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-12Fix some CMake compiler tests for Win64Graham Bloice1-1/+1
Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7 Reviewed-on: https://code.wireshark.org/review/8909 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-03Fix OSX CMake warningsGraham Bloice1-0/+5
Set the CMake policy for CMP0042 to old Change-Id: I2b71e1d8d9b9b90ede11df1a7874a2360c3032c5 Reviewed-on: https://code.wireshark.org/review/8740 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-31Fix zlib cmakeGraham Bloice1-4/+2
Add support for the locally modified version of zlib to suppress a CMake warning and disable building of the zlib examples. Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23 Reviewed-on: https://code.wireshark.org/review/8706 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-19Fix CMake warningsGraham Bloice1-4/+4
Rename a local CMake variable to prevent CMP0054 warnings in CheckTypeSize and CheckStructHasMember modules. Change-Id: Ida0df954c81333ad37455db90e0d72ca9df8c6f1 Reviewed-on: https://code.wireshark.org/review/8522 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-05CMake: Try to fix version.h dependencies.Gerald Combs1-10/+10
Make the gitversion target depend on version.h instead of running make-version.pl separately. Make wsutil and qtui depend on gitversion. Change-Id: I32f25347c12c7f86b2439ed4bf517cc8f5fb106f Reviewed-on: https://code.wireshark.org/review/8299 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-01Add tshark -z "ncp,srt"Michael Mann1-0/+1
Change-Id: Iab2559c2bac5550987c108c6e917506fcec525e9 Reviewed-on: https://code.wireshark.org/review/8221 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-30CMake: Always set PROCESSOR_ARCHITECTURE on Windows.Gerald Combs1-2/+6
An undefined or invalid PROCESSOR_ARCHITECTURE will produce an invalid wireshark.exe.manifest. Make sure it's always set. Change-Id: I1b33f7bd5e964f05344919d1f11d88c14104c0ce Reviewed-on: https://code.wireshark.org/review/8253 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-30CMake for Windows improvementsGraham Bloice1-8/+15
Allow the wireshark libs directory to be defined by WIRESHARK_LIB_DIR. Ensure either WIRESHARK_LIB_DIR or WIRESHARK_BASE_DIR is defined. Ensure the compiler is a supported version (VS2010, 12 or 13). Change-Id: I0abd371c5773c08ca255abe308d1a59e2e290a02 Reviewed-on: https://code.wireshark.org/review/8247 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-29CMake Windows fixesGraham Bloice1-1/+7
Set the minimum version for Windows to 3.1.3 Set the policy for CMP0054 to squelch a few warnings. Change-Id: I7647a0e5dce83db2cd87d7b8048c808e10863c7e Reviewed-on: https://code.wireshark.org/review/8241 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-28Add service_response_time_table for TShark srt stats.Michael Mann1-0/+1
This is a "refactoring part 1" of the srt stats. This first step is using the service_response_time_table for all (possible) TShark srt stats. Next step will be combining the GTK and TShark service_response_time_table, so there is more code reuse and the "shared structure names" between GTK and TShark service_response_time_table won't seem as bad. Maybe it can even go one step farther and handle a dynamic number of columns so this refactoring can apply to all srt stats. Change-Id: Ief28e7e55f7dbbf4f2d9bb6f1a1592b87b866137 Reviewed-on: https://code.wireshark.org/review/8210 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-28Add tshark -z "smb2,srt"Michael Mann1-0/+1
Change-Id: I66247132f00c83f35cf78cb63ea00a5ce923fddb Reviewed-on: https://code.wireshark.org/review/8211 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27Add tshark -z "ldap,srt"Michael Mann1-0/+1
Bug: 9363 Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c Reviewed-on: https://code.wireshark.org/review/8196 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23CMake fix windows setupGraham Bloice1-4/+4
Standardise the args to win-setup.ps1 Change-Id: Ibd9d7bb338edb1cef444abc37a7b103eec38fb09 Reviewed-on: https://code.wireshark.org/review/8173 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-21[Androiddump] Fix CMake install path for androiddumpmichal.orynicz1-5/+6
Changed path from "share" to one based on plugns path For example /usr/local/lib/wireshark/extcap Change-Id: I8f4a9f274b1cec897ed45de9e05679ac3f230301 Reviewed-on: https://code.wireshark.org/review/8161 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2015-04-20CMake minor updatesGraham Bloice1-4/+5
Fix up generation messages for Windows build Remove some superfluous Lua messages Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9 Reviewed-on: https://code.wireshark.org/review/8138 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>