aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2017-10-15FindPOD.cmake: look for pod2man.batPeter Wu1-0/+1
Strawberryperl 5.26.1.1 installs "pod2man.bat" but not "pod2man" so find_program cannot locate it. Change-Id: Iebfe2efec220085b15a4d73681da9cc7ea6a5360 Reviewed-on: https://code.wireshark.org/review/23913 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-13CMake: Allow user build flags to override default build flagsJoão Valverde1-1/+0
Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-28Remove TPG plugin and dependenciesJoão Valverde1-23/+0
It doesn't build with autotools and CMake. Under-documented and unmaintained. Seems to be a work-in-progress that stalled. Introduces spurious CMake dependency on yapp. Change-Id: I0dca1ccbdfd683586c05765437d4b7804ab5cc70 Reviewed-on: https://code.wireshark.org/review/23758 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: Anders Broman <a.broman58@gmail.com>
2017-09-23plugins: Fixups for g9260461f4fJoão Valverde1-1/+1
Put plugins in CMake build dir with a version subdir. This avoids some weird special cases, however running with autotools from build dir displays the wrong global folder in about->folders. Unfortunately the hack to run from the autotools build dir is troublesome. Various fixes for Windows builds. Try to fix also build dir issue loading plugins on macOS with ENABLE_APPLICATION_BUNDLE (blind). Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c Reviewed-on: https://code.wireshark.org/review/23657 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-08Use cmake_push_check_state() and cmake_pop_check_state().Guy Harris3-5/+9
Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-03CMake: Use GNUInstallDirs module instead of our ownJoão Valverde1-93/+0
Change-Id: I42f62824f226b091ff9bb86ce5c222333f98d783 Reviewed-on: https://code.wireshark.org/review/23379 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>
2017-08-29CMake: We no longer support Visual C++ 2005 or 2008.Gerald Combs1-5/+1
Change-Id: Ide3688366aa3c38d48ff29224dbfc0fdb7bf1b7a Reviewed-on: https://code.wireshark.org/review/23277 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>
2017-08-22Add hardware timestamping supportAhmad Fatoum1-0/+1
pcap provides a pcap_set_tstamp_type function, which can be used to request hardware timestamps from a supporting kernel. This patch adds support for aforementioned function as well as two new command line options to dumpcap, wireshark and tshark: --list-time-stamp-types List time stamp types supported for the interface --time-stamp-type <type> Change the interface's timestamp method Name choice mimics those used by tcpdump(1), which already supports this feature. However, unlike tcpdump, we provide both options unconditionally. If Wireshark was configured without pcap_set_tstamp_type being available, --list-time-stamp-types reports an empty list. Change-Id: I418a4b2b84cb01949cd262aad0ad8427f5ac0652 Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com> Reviewed-on: https://code.wireshark.org/review/23113 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-14CMake: Remove an unused variable.Gerald Combs1-1/+0
Remove a variable apparently left over from the DocBook→AsciiDoc transition. Change-Id: Ieb6e2fd282ab71227bc5d33c200f04051acf529b Reviewed-on: https://code.wireshark.org/review/23077 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-04CMake: Don't look in WOW6432Node.Gerald Combs1-1/+0
CMake should check both the 32-bit and 64-bit views automatically. Change-Id: I856814efcd660260c734c7956ad00ee43a8f666f Reviewed-on: https://code.wireshark.org/review/22936 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-01Look for Cygwin in one more place.Gerald Combs1-7/+9
Add "HKLM\SOFTWARE\WOW6432Node\Cygwin\setup" to the Cygwin search paths. Change-Id: I302ecea67dd580449b450136c027ac37adf586d3 Reviewed-on: https://code.wireshark.org/review/22893 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-30Add G.729 decoding based on bcg729 libraryPascal Quantin1-0/+55
Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-29Windows: fix generation with CMake 3.9.0Ike Gilbert1-0/+81
By using CMake FindPerl.cmake module, CYGWIN_INSTALL_PATH variable gets overwritten, bypassing our modified FindCygwin.cmake. Let's package our own version FindPerl.cmake to avoid this. Bug: 13922 Change-Id: If68e96ba312c2c6fa417721e7aec2ae6e5179a81 Reviewed-on: https://code.wireshark.org/review/22834 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-21Require at least c-ares 1.5.0 when configuring.Guy Harris1-1/+11
That way, if you have an older version, we fail at configure time, with what should be a message indicating that your c-ares is too old, rather than at compile time, with what might provoke users to ask "what am I doing wrong?" or "what do I need to fix?" or "why is my compile failing?" or.... Change-Id: I911574c4d90174b6bd074c5ef537557d47b199dc Reviewed-on: https://code.wireshark.org/review/22752 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-20CMake: Escape shell command quotes.Gerald Combs1-2/+2
Escape shell command quotes so that what appears to be "unquoted_legacy" behavior doesn't kick in. Ping-Bug: 12305 Change-Id: I4763df2fbc58b80d6e4e3ec15f78c16fa1cf3853 Reviewed-on: https://code.wireshark.org/review/22732 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-27CMake: Fix the WiX search path.Gerald Combs1-3/+9
Look for WiX executables in $WIX/bin instead of $WIX. Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f Reviewed-on: https://code.wireshark.org/review/22423 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-27On UN*X, make sure we can find inflate() in libz.Guy Harris1-0/+16
For example, on at least some versions of Fedora, if you have a 64-bit machine, have both the 32-bit and 64-bit versions of the run-time zlib package installed, and have only the *32-bit* version of the zlib development package installed, it'll find the header, and think it can use zlib, and will use it in subsequent tests, but it'll try and link 64-bit test programs with the 32-bit library, causing those tests to falsely fail. Hilarity ensues. Change-Id: Ic2536e8a652ef96e2a3923c1faa61f6c8c06bf58 Reviewed-on: https://code.wireshark.org/review/22417 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>
2017-06-27Don't check for inflatePrime() on Windows.Guy Harris1-5/+19
On Windows, we build libz as part of the Wireshark build process, so we don't necessarily *have* a libz library to search or inflatePrime() at this point; the search fails on the buildbots, for example. So, on Windows, we just assume we have a new enough version of libz, so that it has inflatePrime(). Bug: 13850 Change-Id: Ied0909f4a591ff3312d83a2a2ed41e3cd12218e8 Reviewed-on: https://code.wireshark.org/review/22413 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16Rename FindOS_X_FRAMEWORKS.cmake for the new OS name.Guy Harris1-0/+0
It's now FindMACOS_FRAMEWORKS.cmake. (But is it actually *used*? CMakeLists.txt does the check itself.) Change-Id: I6e972869b94da959dc7c9a3fccacfbd35e0e992c Reviewed-on: https://code.wireshark.org/review/22163 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16Change some names to reflect Apple's new UNIX-for-Macs name.Guy Harris1-3/+3
{OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-10Simplify the search for HTMLHelp.Anders1-22/+14
Change updated as per https://gitlab.kitware.com/cmake/cmake/issues/16950#note_277462 Change-Id: I794e6cf7af3d1affa7ee5182374b6f22d9acdf33 Reviewed-on: https://code.wireshark.org/review/22051 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-08CMake: Look for Python in more places.Gerald Combs1-4/+7
According to PEP 514, Python.org's Windows installer stores its installation path in HKEY_LOCAL_MACHINE\Software\Python\<Company>\<Tag>\InstallPath where <Tag> is the value of sys.winver. Newer versions of python add "-32" and "-64" to the version in order to allow side by side installations. Adjust LocatePythonExecutable accordingly. Change-Id: I8c7f8b4c31b37e7f687ce9909f97d62a779cfa91 Reviewed-on: https://code.wireshark.org/review/22048 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-08CMake: Add local copy of FindHTMLHelp.cmakeGraham Bloice1-0/+59
Add a local copy of FindHTMLHelp.cmake to search for hhc.exe that includes the 32 bit program files locations "Program Files (x86)" as this is where hhc.exe normally lives. Change-Id: Ic5917a0765786ac483a7d4ef457043319d0e8501 Reviewed-on: https://code.wireshark.org/review/22037 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>
2017-06-05Revert "More 2.4 initialization."Gerald Combs1-1/+1
This reverts commit c60a6580c935c68d8bb82a84f0359b46b1bf06a5. Wrong branch. Change-Id: I846b26d09bf1ab99d3f42baf35f1a63f1dd806d2 Reviewed-on: https://code.wireshark.org/review/21967 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-05More 2.4 initialization.Gerald Combs1-1/+1
Change-Id: Iac4c02068eb462854b66c1561f4dfa2601bb18bf Reviewed-on: https://code.wireshark.org/review/21966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-12Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1Pascal Quantin1-1/+1
Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af Reviewed-on: https://code.wireshark.org/review/21609 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: Michael Mann <mmann78@netscape.net>
2017-05-11Revert "Revert "Get rid of HAVE_REMOTE.""Guy Harris1-1/+0
This reverts commit 8cd1fd0c993df904596390ebdf350259e7c9c5fc. Making HAVE_REMOTE a config.h #define is a really horrible idea. It's *NOT* a configuration option. Instead, HAVE_REMOTE should be defined by other mechanisms, as was done in 79eab8ca070f978415126f85b0777ab4ab02f0a2. Change-Id: I4632b63bd73a25a27c5f4686d2baf3e0beddecb3 Reviewed-on: https://code.wireshark.org/review/21604 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11Revert "Get rid of HAVE_REMOTE."Jörg Mayer1-0/+1
This reverts commit d13b8ea13cf708a7770e7f51912ce16d0b43e459. This will only work with git HEAD of libpcap, but not with any release versions of libpcap or winpcap (the *pcap includes require the define, not Wireshark). Change-Id: I08e5ec66e3642dc02f793c83ffc4363bb348202c Reviewed-on: https://code.wireshark.org/review/21603 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-05-10Get rid of HAVE_REMOTE.Guy Harris1-1/+0
We never test for it - we test for HAVE_PCAP_REMOTE - so there's no need to set it in config.h. While we're at it, note that "PCAP" in "HAVE_PCAP_REMOTE" can refer to libpcap as well as WinPcap, given that, at least in the tip of the master branch, you can configure remote support in libpcap, although it's not enabled by default (it needs to be vetted for security, as it increases the attack surface of a machine running the server *and* of an application using libpcap with remote support). Change-Id: I3c96cf16bbda19ec7c085f74cffc6f125198d45b Reviewed-on: https://code.wireshark.org/review/21589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-26FindPOD.cmake: look for pod2html.batPeter Wu1-0/+1
Strawberryperl 5.24.1.1 installs "pod2man", "pod2man.bat" and "pod2html.bat", but not "pod2html" so find_program cannot locate it. Change-Id: Id52ee7e77bbbfc8c2fcc6ab66c498d4818f54bf8 Reviewed-on: https://code.wireshark.org/review/21350 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26cmake: make Cygwin optionalPeter Wu2-7/+10
Cygwin is not needed if the documentation is not built (i.e. asciidoc, docbook, xsltproc are not needed). Via Chocolatey the following packages can be installed: git, winflexbison, strawberryperl. Change-Id: Ib13d144321cf6d2ed5c3346a2ae271de983deada Reviewed-on: https://code.wireshark.org/review/21316 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26Remove runlex.sh script, just run lex directlyPeter Wu1-3/+1
This removes the need for sh (and Cygwin) on Windows to build Wireshark. runlex.sh (added in commits 5be4499a and 517d6d57) was added because older flex had quirks with its options (and the --header(-file) option was not available). The minimum required flex version for reentrant scanners (2.5.6) does not have these issues though, so remove the step. Change-Id: I73c82bb329e2130481efca94809dc60b86dcbafe Reviewed-on: https://code.wireshark.org/review/21315 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26cmake: remove dependency on sedPeter Wu2-30/+1
runlex.sh does not need sed anymore since v2.3.0rc0-2386-g64f83641ad. Since building docs already depends on Perl, let's use Perl instead. Change-Id: Id7e923e47001cfd32c8cef89960377026464f2ee Reviewed-on: https://code.wireshark.org/review/21314 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-19cmake: FixLibXML2 includeRoland Knall1-0/+1
Add default setting for the libraries entry, to satisfy windows builds, if no libxml2 has been found Change-Id: I3db026b6b8446eb42c7f30ee63c00a07600948fa Reviewed-on: https://code.wireshark.org/review/21221 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum1-0/+108
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-14Update Windows binaries to GeoIP 1.6.10 with a local GeoIP_free functionPascal Quantin1-0/+1
This solves a crash occurring when trying to free memory allocated by GeoIP (cross-compiled with mingw(32|64)) with MSVC function Bug: 13598 Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728 Reviewed-on: https://code.wireshark.org/review/21090 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12cmake: fix sporadic WSDG build failure on WindowsPeter Wu2-6/+46
The Windows builds (using msbuild) fail sporadically when building documentation (target developer_guides). The problem is that the targets "developer_guide_pdf_a4" and "developer_guide_html" both depend on developer-guide.xml and msbuild does not notice that the file has already been generated by the generate_developer-guide.xml target. For a discussion of the problem, see https://gitlab.kitware.com/cmake/cmake/issues/16767 To fix this, remove the "developer-guide.xml" dependency from "developer_guide_xyz" (to prevent these targets from triggering building "developer-guide.xml"). Instead, depend on a generated "developer-guide.xml-stamp" file which is created by the "generate_developer-guide.xml" target (but do *not* add it as output of this target, otherwise we will have the original problem again). This workaround is restricted to the MSVC generators because otherwise it would trigger a CMP0058 policy warning when used with Ninja. Change-Id: Idb3975cde35be2601b038a500d4886bbd3a684d7 Reviewed-on: https://code.wireshark.org/review/20812 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris3-6/+6
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-17CMake: Move the search for libgcc_s to GLib.Gerald Combs3-2/+3
Move the search for the libgcc_s_seh and _sjlj DLLs to the GLib directory. That's the only place it currently exists on the 64-bit builder. Change-Id: Icf55dacf061d9423e78cabeaf16aa539ccb619bb Reviewed-on: https://code.wireshark.org/review/20162 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-16Qt: Warn the user about DBAR 1.8 on Windows.Gerald Combs1-0/+1
At startup, dig through the registry looking for shell extensions. If any of them match known Dell Backup and Recovery DLL names and the DLL version matches 1.8.*.*, show the user a warning dialog. This is a bit extreme but I'm not sure what else to do. Dell is a popular computer manufacturer and bug reports keep trickling in. Change-Id: I6d1bd6c56850279356570154d231b07facb30cff Bug: 12036 Ping-bug: 12701 Ping-bug: 13414 Reviewed-on: https://code.wireshark.org/review/16861 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-15Cleanup runlex.sh to use builtin POSIX functions instead of sedMark Phillips1-1/+1
Bug: 13412 Change-Id: If43b30a33dcc4f23ba2bcb3cce3d0feea0d9fe40 Reviewed-on: https://code.wireshark.org/review/20120 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-15Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6Pascal Quantin2-3/+9
Also switch some third party libraries to stripped version to reduce size Change-Id: If0fd06a85fb17fb3e35543bcc714c8a8a1ce20c6 Reviewed-on: https://code.wireshark.org/review/20117 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-12-15Fix release-notes.html generationGraham Bloice1-4/+0
The ASCIIDOC_CONF_FILES setting for asciidoc was only generated if any of the guides were being built. Clean up a dup setting and some and blank lines in FindASCIIDOC Change-Id: Ie8ab97db09e18cdb8d7e2a7bd4dcf8c288dd036f Reviewed-on: https://code.wireshark.org/review/19291 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-12-13Update to WinSparkle 0.5.3.Gerald Combs1-3/+9
Update our WinSparkle package to 0.5.3. This fixes a file deletion bug. Note that WinSparkle now supports application shutdown callbacks, which should let us fix bugs 9687 and 12989. Bug: 13217 Change-Id: I4b5f325c6dc251ce167f7bd344bbf3ca5ad3fe14 Reviewed-on: https://code.wireshark.org/review/19230 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-12-07Change SpanDSP capitalizationPascal Quantin1-8/+8
Many capitalization can be found for this library (spandsp, Spandsp, SpanDSP), let's use the one found in the library README and in its spec file. Change-Id: Ia66b723e5d582a6218da1b6366b7d4859272f80c Reviewed-on: https://code.wireshark.org/review/19122 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu1-0/+55
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 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: Peter Wu <peter@lekensteyn.nl>
2016-12-05CMake: Update FindWiX.Gerald Combs1-4/+16
The WiX Toolset installer sets the WIX environment variable. Search for our WiX executables there first. Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3 Reviewed-on: https://code.wireshark.org/review/19096 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-11-21cmake: add creation of version.conf to be shipped in tarball.Dario Lombardo1-0/+11
Change-Id: I2bb66844b29cd4805d201891ffba342d26ee475f Reviewed-on: https://code.wireshark.org/review/18731 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-18cmake/FindPCAP: fix use of bad cached function checksPeter Wu1-46/+48
When libpcap-dev is not installed, do not look for functions like pcap_datalink_name_to_val since the negative result would be cached. Then after installing libpcap-dev, the build would fail due to redeclaration of functions. Change-Id: Ifdbad09e9cf160383b16b6459693f7ea5d65b9c3 Reviewed-on: https://code.wireshark.org/review/18834 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-08cmake: fix the linker flags test for Visual StudioMartin Kaiser1-2/+2
ddd1c87d43781533c3ec10279857e3870d12437e modified the order of linker command line options. This broke the tests and made invalid linker flags seem valid. (Link target) -> LINK : warning LNK4044: unrecognized option '/Wl,--as-needed'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] LINK : warning LNK4044: unrecognized option '/pie'; ignored [C:\wireshark\build3\wsutil\wsutil.vcxproj] The simple fix is to add specific options for Visual Studio and clang at the beginning of the linker's command line options rather than at the end. Change-Id: I6492ea1271e18be0d190e7579f47baecf6ac4d61 Reviewed-on: https://code.wireshark.org/review/18709 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 09:18:12 +0000