summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-10-28CMAkelists: fix typo on commentAlexis La Goutte1-1/+1
Change-Id: I572ebbbae9ac91e2d566a39d0dae462bc40bcac8 Reviewed-on: https://code.wireshark.org/review/18522 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22Add SBC decoding support to WindowsPascal Quantin1-0/+7
Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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-10-22cmake, qt4: check if QT4_FOUNDMartin Kaiser1-1/+1
AFAICS, FindQt4.cmake sets QT4_FOUND, not Qt4_FOUND This fixes compilation on Debian Wheezy (cmake 2.8.9, Qt 4.8.2). Change-Id: I08b3ac6ae4292b8c8d3f9e8752780459e5329e29 Reviewed-on: https://code.wireshark.org/review/18395 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-22CMake: Disable Qt4 && (Windows || macOS).Gerald Combs1-1/+4
We haven't built the Windows and macOS installers with Qt4 for quite some time. In the case of macOS+Qt4 it looks like there's a problem with the main screen size (bug 13009) and it's a safe bet that there are other problems. There's not much we can do exept say "don't do that." Do so at build time rather than after the user has installed Wireshark and is trying to use it. Change-Id: I22f47b9705ea044238046676b6336aa5feab3f60 Reviewed-on: https://code.wireshark.org/review/18364 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>
2016-10-20cmake: add dependency to build manual pagesPeter Wu1-0/+1
"add_custom_command" outputs are only available as dependency in the same directory, so create a new target such it can be used from the main directory. This fixes the OS X build with no parallelism (-j1). Change-Id: I66aa5ae307be38ee715456a05fd55f55e4fa76e9 Reviewed-on: https://code.wireshark.org/review/18299 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-20Officially require Qt 4.8 or newerPeter Wu1-1/+1
Since v2.3.0rc0-1002-g1cd2255, Qt 4.8 became mandatory, reflect this in the version requirements. This will not affect a lot of distributions (RHEL and SLES only had Qt 4.6). For a more complete list of supported platforms, see https://wiki.wireshark.org/Development/Support_library_version_tracking While at it, correct some other minimum versions in documentation. Change-Id: I11f2dfba72c75429f6838404a81ed3b3dc302d5f Reviewed-on: https://code.wireshark.org/review/18314 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18CQL: add LZ4/Snappy decompression support on WindowsPascal Quantin1-0/+14
Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17cql: add lz4 and snappy decompressionBenoît Canet1-0/+18
We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-14CMakeLists: Add man filesUli Heilmeier1-2/+2
Current Wireshark.app bundle on OS X doesn't include man pages. This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0 has been reverted. Now cmake gets the information that the man files are generated. Bug: 12746 Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb Reviewed-on: https://code.wireshark.org/review/18170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-1/+11
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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-10-08Revert "CMakeLists: Add man files"Uli Heilmeier1-0/+2
This reverts commit 55148a2ea470d19290d236428f3c8e725775c96a. Change-Id: If93b97933cae4d8ffd1e4cc9a635def031ab0cc6 Reviewed-on: https://code.wireshark.org/review/18123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-07Disable ASAN when building lemon.Gerald Combs1-0/+6
If ASAN is enabled, use "-fno-sanitize=all" when building lemon. This keeps us from having to set ASAN_OPTIONS=detect_leaks=0 in the environment in order to build Wireshark. Change-Id: I36f6d1a4f913ecabaf188f4c2b59216c8430d81a Reviewed-on: https://code.wireshark.org/review/18098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-05CMakeLists: Add man filesUli Heilmeier1-2/+0
Current Wireshark.app bundle on OS X doesn't include man pages. Change-Id: I4123105ae805c3f127dbfd74768b88d4da546c56 Ping-Bug: 12746 Reviewed-on: https://code.wireshark.org/review/17902 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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-09-30cmake: make WERROR_COMMON_FLAGS a normal stringPeter Wu1-10/+7
Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-09-26Add an initial "shellcheck" target.Gerald Combs1-0/+19
Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 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-09-17Remove -Wdeclaration-after-statementPeter Wu1-1/+0
This is a C99 feature which we can use now. Change-Id: I84a63d6bf282b79c9f0da0543b3b4f5a0cf0c81a Reviewed-on: https://code.wireshark.org/review/17733 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16extcap: add udpdump.Dario Lombardo1-0/+21
Udpdump is a generic UDP receiver that exports datagram in PCAP format. Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14 Reviewed-on: https://code.wireshark.org/review/17195 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-07Add some notes about XLC, HP C, and Sun/Oracle C.Guy Harris1-0/+26
Change-Id: I2f65face2aa7354ec350aed308402bb719bd619f Reviewed-on: https://code.wireshark.org/review/17546 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Allow a lot more C99 featuresPeter Wu1-3/+14
Flexible array members are supported by gcc, clang and even MSVC2013. Note, so far it was only used in the Windows-specific airpcap.h. Trailing commas in enum declaration are already in use since for these dissectors (commit ID is the first occurrence): epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08 epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40 epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8 Inline functions using the "inline" keyword are supported via all glib versions we support (if it is missing, glib will define a suitable inline macro). Other c99 functions listed in the README.developer document were found to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013. Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a Reviewed-on: https://code.wireshark.org/review/17421 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-02CMake: Move version declarations to the top of CMakeLists.txt.Gerald Combs1-14/+14
This lets me be more lazy during releases. Change-Id: Ie59e200f1f46282e9271f459c0bbf31dc74a59a7 Reviewed-on: https://code.wireshark.org/review/17450 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-08-23CMake: Allow setting per target compiler warningsJoão Valverde1-30/+58
Setting our compiler warning flags in CMAKE_C_FLAGS does not allow using different flags per target. Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS and using the COMPILE_OPTIONS property to set them. This change is just setting mechanism and there should be no difference in generated warnings. The check_X_compiler_flag cmake test is changed to test each flag individually. We need a list, not a space separated string, and the aggregate test is not significant. Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25 Reviewed-on: https://code.wireshark.org/review/17150 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-08-04Bump GLib minimum required version to 2.22.0João Valverde1-1/+1
Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413 Reviewed-on: https://code.wireshark.org/review/16879 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-212.1.2 → 2.3.0.Gerald Combs1-3/+3
Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b Reviewed-on: https://code.wireshark.org/review/16575 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14More 2.1.1 → 2.1.2 changesPascal Quantin1-2/+2
Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4 Reviewed-on: https://code.wireshark.org/review/16441 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-14Build 2.1.1, second try.Gerald Combs1-1/+1
The buildbots that create packages run `perl make-version.pl --set-release` at the beginning of each build. This in turn sets the extra version information for our generated packages to "-g<abbreviated hash>" for development builds, or "" (an empty string) for release builds. Hardcoding the extra version information to "-git" in CMakeLists.txt and configure.ac means we end up with wireshark-2.1.0-git.tar.bz2, Wireshark-win64-2.1.0-git.exe, etc. for release builds. Set them back to empty strings. Change-Id: Icdfb248d25ad4adbc9abe0bd938e410590e42828 Reviewed-on: https://code.wireshark.org/review/16439 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-07CMakeLists.txt: Fix gcee3e82João Valverde1-1/+1
Bug: 12589 Change-Id: I7f9be4027214cb7ae4f7b235cba73c088596a80d Reviewed-on: https://code.wireshark.org/review/16322 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-05Remove remnants of g_spawn_helper supportPascal Quantin1-14/+0
Change-Id: I88121a280ff01a889daeda438b308380b6ea0703 Reviewed-on: https://code.wireshark.org/review/16303 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-05extcap: Remove g_spawn_helper supportRoland Knall1-0/+1
Move g_spawn to separate file and implement functions to use Windows based method of spawning, instead of the glib based version Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f Reviewed-on: https://code.wireshark.org/review/16049 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-29CMake: Update the macOS wrapper script behavior.Gerald Combs1-1/+2
CMake on macOS creates a convenience wrapper (run/wireshark) that runs run/Wireshark.app/Contents/MacOS/Wireshark. Have it run the executable using "exec" instead of opening the bundle using "open" so that Wireshark runs in the foreground. Change-Id: I295ce0681da75678e5e01781e9c8fb58e2236fc9 Reviewed-on: https://code.wireshark.org/review/16196 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-06-27CMake: Qt 5.7 requires C++ 11.Gerald Combs1-0/+11
Add -std=c++11 to CMAKE_CXX_FLAGS if we have Qt >= 5.7.0 and we're compiling with g++ or clang++. Change-Id: Id4ce5921ce5c475e9eb9cc67f94c3b3a895924a1 Reviewed-on: https://code.wireshark.org/review/16135 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: João Valverde <j@v6e.pt>
2016-06-15Pass "/utf-8" to Visual C++ 2015.Gerald Combs1-1/+2
Many projects (Qt[1] and GNOME[2] in particular) either recommend, use, or at least allow for UTF-8 in source and header files. Pass /utf-8 to Visual C++ 2015 so that it will behave itself around UTF-8 and be more like that nice compiler down the street. [1] https://wiki.qt.io/Strings_and_encodings_in_Qt [2] https://bugzilla.gnome.org/show_bug.cgi?id=767218 Change-Id: Ibc90d235742134cb42dd796ba529699bcbbe3ad0 Reviewed-on: https://code.wireshark.org/review/15821 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>
2016-06-15Remove Nmake build systemPascal Quantin1-1/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15cmake: fix ENABLE_ASAN detectionPeter Wu1-15/+12
Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a different feature (which could be added later as desired). This makes the -DENABLE_ASAN=1 option match the autotools --enable-asan option. Fail hard if ASAN support is requested but not supported, this avoids surprises when something is wrong. Fix ASAN detection by setting the linker option too. Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN detection, you have to clear your CMakeCache.txt file to redo the detection. Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4 Reviewed-on: https://code.wireshark.org/review/15908 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14Revert "Move inclusion of CmakeListsCustom to the end of the file in order ↵Anders Broman1-2/+1
to have all defines in place." This reverts commit bcbcad1e597f89e64389b6cc25b2fdbe9f89d960. This change breaks building of custom plugins. Change-Id: I63e88ceb922ca23ead9784705ad8ba088a504fd1 Reviewed-on: https://code.wireshark.org/review/15893 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-13Move inclusion of CmakeListsCustom to the end of the file in order to haveAndersBroman1-1/+2
all defines in place. Change-Id: I190257e9b833c409921bbca74c8ab531b632c60d Reviewed-on: https://code.wireshark.org/review/15878 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>
2016-06-12CMake: Make PROJECT_VERSION_EXTENSION code simplerJoão Valverde1-8/+4
The intent was to allow all sorts of overrides but, ugly. I don't think we need $cmake_package_string either, at least with these changes. Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23. (And bdec712166ba924a2cdeaaca8ae580c343eaf02c). Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db Reviewed-on: https://code.wireshark.org/review/15835 Reviewed-by: João Valverde <j@v6e.pt>
2016-06-082.1.0 → 2.1.1.Gerald Combs1-3/+3
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5 Reviewed-on: https://code.wireshark.org/review/15785 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Build 2.1.0, second try.Gerald Combs1-1/+1
Remove the "-git" version extra default in CMakeLists.txt and configure.ac, otherwise we end up with wireshark-2.1.0-git.tar.bz2, Wireshark-win64-2.1.0-git.exe, etc. Change-Id: I89b9beaa87ac475950e24a3111cf09e878a33ff7 Reviewed-on: https://code.wireshark.org/review/15784 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-22Make -Wunused-const-variable a C only warningJoão Valverde1-1/+1
Change-Id: If93de2c371f36fa0447fb8215337f0c115d74bbb Reviewed-on: https://code.wireshark.org/review/15524 Reviewed-by: João Valverde <j@v6e.pt>
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-19 14:32:29 +0000