summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-05-11Create a Wix InstallerMichael Mann1-0/+16
This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-10When using clang, warn about c99 only syntax (like pedantic without all the ↵Joerg Mayer1-0/+2
rest). Change-Id: Ife6fcb14ce04e4d505ee4911a102420932fb18de Reviewed-on: https://code.wireshark.org/review/15334 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-05-09SMI_DLL should not be part of directory path for copying MIBsMichael Mann1-7/+7
Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 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: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-02Add checkAPI calls to CMake.Graham Bloice1-10/+24
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-25Compile sshdump and ciscodump for WindowsPascal Quantin1-0/+1
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22Add CMake version.h dependencyJoão Valverde1-7/+20
Remove the need for version.h.in and bring CMake up to par with autotools. Change-Id: I701b56c475f5fdec1f9a028536fff6992ce8eaca Reviewed-on: https://code.wireshark.org/review/15031 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-21Link version code statically againJoão Valverde1-0/+9
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-21Add "-git" tag to versionJoão Valverde1-1/+10
Add a static "-git" extra version tag for VCS snapshot builds, to be replaced when running 'make-version -r'. Change-Id: If29fca04029ed3129aa2332492dc536091049955 Reviewed-on: https://code.wireshark.org/review/15032 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-13Windows: Remove the need for _CRT_NONSTDC_NO_DEPRECATE.Gerald Combs1-1/+0
Replace some function calls with their non-deprecated equivalents so that we can remove _CRT_NONSTDC_NO_DEPRECATE from CMakeLists.txt and config.nmake. Leave _CRT_SECURE_NO_DEPRECATE in place. Removing it failed with 145 warnings and 72 errors. Note that we could probably improve startup performance by using wmem in diam_dict.*. Change-Id: I6e130003de838aebedbdd1aa78c50de8a339ddcb Reviewed-on: https://code.wireshark.org/review/14883 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-09[GTK] Check for xdg-open at run timeJoão Valverde1-4/+0
Remove HTML_VIEWER compile-time setting. If xdg-open doesn't exist use user web browser preference as fallback. Change-Id: I3b4a4a1a36b0192d75f2c97595f37d0d88a0941e Reviewed-on: https://code.wireshark.org/review/14805 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-08Use a single WS_NORETURN macroPeter Wu1-6/+7
Having to define two macros for marking a function as never returning seems a bit redundant. Merge the MSVC and GCC-like attributes into a single WS_NORETURN. Tested with Clang 3.7.1, GCC 4.4.7 and even GCC 4.1.2 using this small program (-Wall -Wextra, the first two generate warnings for uninitialized variables, the last one compiles without warnings): #include <stdlib.h> __attribute__((noreturn)) void foo() { exit(1); } __attribute__((noreturn)) void bar(); void bar() { exit(1); } int main() { int j, i; if (i) { bar(); return j; } foo(); return j; } Change-Id: I7d19c15e61b8f8fa4936864407199c4109f8cc82 Reviewed-on: https://code.wireshark.org/review/14822 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-07Remove -Warray-bounds, it is enabled by default with -WallJoão Valverde1-1/+0
Change-Id: If2041c66ccdf8a975d660524c793d45aa9f80623 Reviewed-on: https://code.wireshark.org/review/14852 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Rename "libz" to "zlib"João Valverde1-2/+2
Change-Id: I12f92c983d587c2a4751428cdf299635090c9f0b Reviewed-on: https://code.wireshark.org/review/14748 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-04Remove synchronous DNS name resolutionJoão Valverde1-2/+1
Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-31Revert "Trun on -Wused-but-marked-unused but only as warning, never as ↵Alexis La Goutte1-3/+0
error. (possibly clang only)" This reverts commit 9f40a75bbb9ea8e205bf0ebf9f0651971417cd6e. Change-Id: I4361f1101077643d10a86237e256ba28ed180a66 Reviewed-on: https://code.wireshark.org/review/14721 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-29Use "old-style" moc options to ensure backward compatibility for Qt toolsJoão Valverde1-1/+2
Change-Id: Ic96df4ba521e0fbaf4ac34f23e3a89304ed5de5c Reviewed-on: https://code.wireshark.org/review/14662 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-28Trun on -Wused-but-marked-unused but only as warning, never as error.Joerg Mayer1-0/+3
(possibly clang only) Change-Id: I014b8f069515af6128177dfc5813380db445957c Reviewed-on: https://code.wireshark.org/review/14686 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>
2016-03-28Fix out-of-tree "gen-authors" targetPeter Wu1-5/+5
Change directory to the source tree before invoking `git shortlog`, otherwise it fails on build directories outside the source tree. Alexis suggested to move the git invocation to the perl script, this is done now and also avoids writing AUTHORS.git in the source tree. Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba Reviewed-on: https://code.wireshark.org/review/14660 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-25Remove -W from compiler warningsJoão Valverde1-1/+0
Change-Id: I6d1aeab4fd9dce9b7a9804ac9099d318a2b434d2 Reviewed-on: https://code.wireshark.org/review/14622 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Add ax_lib_socket_nsl.m4 macroJoão Valverde1-6/+0
Add SOCKET_LIBS and NSL_LIBS to global LIBS variables on platforms where it is required. Make configure checks for getaddrinfo/gethostname unconditional, that is handled with #ifdefs if necessary. Change-Id: Ia874038454fb9cf3bdbf8e6fd829f319e331837e Reviewed-on: https://code.wireshark.org/review/14560 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24Put pcapio.c into a writecap library, and use it.Guy Harris1-3/+6
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24extcap: add ciscodump.Dario Lombardo1-1/+28
Ciscodump is a new extcap that allows packet capture on Cisco routers (IOS 12.4 and later) through SSH. Change-Id: Ic9c5be01d3bd0112116f7fc9fa10e26c1552b007 Reviewed-on: https://code.wireshark.org/review/13886 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-21Remove ADNS supportJoão Valverde1-12/+4
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Fix building without extcap enabledJoão Valverde1-3/+3
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap. Some documentation fixes too. Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99 Reviewed-on: https://code.wireshark.org/review/14522 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-20Fix CMake target FOLDER propertiesGraham Bloice1-2/+2
Add FOLDER properties to targets to clean up the presentation in Visual Studio. Change-Id: I35a175175db055443572c58a069879061fdcf0a3 Reviewed-on: https://code.wireshark.org/review/14528 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-18cmake: Remove extcap from include directoriesJoão Valverde1-1/+0
Change-Id: Ia521aaa6ace14df5a6c02e0dd1c8336df41ac180 Reviewed-on: https://code.wireshark.org/review/14517 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-14OS X: Remove GTK+ packaging.Gerald Combs1-2/+2
Remove the GTK+-specific bits from packaging/macosx. Change-Id: I8f7d909f971e60723e421005fdf46de967c69533 Reviewed-on: https://code.wireshark.org/review/14431 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-13Move /asn1 to /epan/dissectorsJoão Valverde1-1/+0
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-11cmake: Copy docs to build datafile dir for NSIS packaging.João Valverde1-0/+22
Change-Id: Icc1f6dadc8bb082c4049cafc6a7e6c2d030ec85e Reviewed-on: https://code.wireshark.org/review/14409 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Add doc/CMakeLists.txtJoão Valverde1-158/+1
Change-Id: I387e893dc5b8b38569f7189d078fdc1853ba012f Reviewed-on: https://code.wireshark.org/review/14269 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-03-08AUTHORS: sort by nameAlexis La Goutte1-1/+2
Change-Id: I01980d1ab757decb7bb84649dbd41477978104c3 Reviewed-on: https://code.wireshark.org/review/14381 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-07Add conflict check filterAlexis La Goutte1-0/+4
Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict... Ping-Bug:2402 Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3 Reviewed-on: https://code.wireshark.org/review/13644 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-06CMake: Avoid pipes and the `cut` command.Gerald Combs1-6/+9
Dump the output of `git shortlog` directly to AUTHORS.git instead of piping it through `cut`. Depending on our toolchain, cmake COMMANDs might not support pipes. This appears to be the case for MSBuild. Removing the `cut` command has the added benefit of reducing our dependency on Cygwin. Pass HEAD to `git shortlog`, otherwise it doesn't return anything when run under MSBuild. Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749 Reviewed-on: https://code.wireshark.org/review/14349 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-04cmake: fix gen-authors target.Dario Lombardo1-1/+1
Also add AUTHORS.git to .gitignore. Change-Id: I63365816fc32b33d064ebbcae0ddb607c2b37f38 Reviewed-on: https://code.wireshark.org/review/14339 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-04extcap: move ssh common functions to ssh-base.Dario Lombardo1-0/+1
Change-Id: Ic06882a4f914b4f89d936d5d942b50552ae4abb3 Reviewed-on: https://code.wireshark.org/review/14264 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-04extcap: add local_interfaces_to_list() to wsutil.Dario Lombardo1-0/+1
This new function abstracts the creation of a list of the local interfaces that will be used by future extcaps to generate specific filters. Sshdump now uses it to create a pcap filter. Change-Id: I5b75a266f81104b3c9bcb3e51de246b7cc8785ce Reviewed-on: https://code.wireshark.org/review/14092 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-03Create perl script to append existing AUTHORS file with information from git ↵Michael Mann1-0/+8
log. new AUTHORS file can be created with "gen-authors" build parameter The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src. This preserves the features authors worked on. For authors that didn't list features, they may be converted to just getting information from git. Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451 Reviewed-on: https://code.wireshark.org/review/14231 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01CMake: Add more structure to libwireshark buildJoão Valverde1-1/+1
Smaller epan/CMakeLists.txt is easier to work with and this structure is well suited to CMake. It should make it easier to manage and configure each epan module differently if necessary. Change-Id: Ia649db3b7dcd405aa43dbdba3288699d5e375229 Reviewed-on: https://code.wireshark.org/review/14068 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-29extcap: Move extcap handling to baseRoland Knall1-1/+1
Also add the extcap-version parameter to enable parsing of version and helppage separately Change-Id: I35ba5aa992940ffbb0cd9ebea8b7c3a1e8629d74 Reviewed-on: https://code.wireshark.org/review/14094 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-26extcap: move windows functions into extcap-baseDario Lombardo1-0/+4
Change-Id: Iec7fed027a24992afd673b09c32470af51739ae5 Reviewed-on: https://code.wireshark.org/review/14075 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+0
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15Build the extcap programs in the extcap directory.Guy Harris1-2/+5
That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-11Use CMake conventional nomenclature for CXX_FLAGSJoão Valverde1-8/+8
Change-Id: I2b67eed2bb04412b9d556e616fe3233176fac5bc Reviewed-on: https://code.wireshark.org/review/13883 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>
2016-02-06CMake: Avoid unnecessary link dependency with SBC and fix debian warningsJoão Valverde1-1/+0
Fixes dpkg warnings: dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/wireshark-qt/usr/bin/wireshark was not linked against libsbc.so.1 (it uses none of the library's symbols) dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/wireshark-gtk/usr/bin/wireshark-gtk was not linked against libsbc.so.1 (it uses none of the library's symbols) dpkg-shlibdeps: warning: symbol sbc_decode used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol sbc_init used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol sin used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol floorf used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol floor used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol sbc_finish used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries Change-Id: I71911513c348edd336cdc82ea358b6a05760b4b9 Reviewed-on: https://code.wireshark.org/review/13784 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-02-03Fix Qt4 moc option argument and add build parametrizationJoão Valverde1-0/+8
Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2 Reviewed-on: https://code.wireshark.org/review/13671 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-02Add configure-time synchronous DNS warnings.Gerald Combs1-0/+5
In CMake and Autotools, warn the user when neither c-ares nor ADNS is present. Note that we might want to make asynchronous DNS a requirement. Change-Id: Ia9cce56cc2286cdc72303fc1410f899f9c320d84 Reviewed-on: https://code.wireshark.org/review/13080 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-27Allow/Create an option to use "capture filter" labels defined in wireshark ↵Mike781-0/+3
GUI from CLI Move ui/filters.[ch] to filter_files.[ch] because dumpcap is using functionality. Bug: 8091 Change-Id: I195c82fc023f97d6f331b8718c45a2d83d30faea Reviewed-on: https://code.wireshark.org/review/5925 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-27Allow make-version.pl to use git when missing from pathChristian Tellefsen1-2/+5
This change allows make-version.pl to run correctly on Windows without having the git binary dir in PATH. This prevents problems when installing "Git for Windows" with default settings (git only available via the bundled shell (bash). Details: * Add Git to the list of packages to be looked up by CMake. * If Git is found by CMake, pass the full path to make-version.pl * make-version.pl: Test whether git is available, and display a warning if git is missing. On Unix-type systems this should have no impact. Tested on Windows Server 2012 R2 and Ubuntu 15.04. Change-Id: I7f7be2035c262658801586cb24c82b912848e31d Reviewed-on: https://code.wireshark.org/review/13111 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-27Don't treat Visual Studio specially for linker flags.Guy Harris1-26/+14
Have CHECK_C_LINKER_FLAG pass /WX to the linker if we're using MSVC, to force the link to fail if the linker doesn't recognize the flag. Add flags to WIRESHARK_LD_FLAGS even with MSVC; let CHECK_C_LINKER_FLAG figure out whether the flag should be used. While we're at it, fix CHECK_C_LINKER_FLAG to save and restore CMAKE_REQUIRED_LIBRARIES. Change-Id: I7f73b4cc3a28eb14e46c2e1e9ad69f5303754f01 Reviewed-on: https://code.wireshark.org/review/13558 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-27Explain why we're still checking for MSVC.Guy Harris1-1/+10
Change-Id: I7d656eb5b38e8f7697b1414b6b3364a85ad132cf Reviewed-on: https://code.wireshark.org/review/13557 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-24 17:17:54 +0000