aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2018-03-06CMake: Fixup our Chocolatey bin path discovery.Gerald Combs5-14/+21
Search for choco.exe directly instead of using PATHS + PATH_SUFFIXES. Look in %ChocolateyInstall%\bin first. CHOCOLATEY_BIN_PATH is the binary path. There's no need to append /bin to it. Change-Id: I732db398bd989bf12222a5cee2c79c0bd4161638 Reviewed-on: https://code.wireshark.org/review/26276 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs2-74/+74
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06CMake: Remove FindSH.Gerald Combs1-36/+0
We haven't used SH_EXECUTABLE since the Asciidoctor migration. Change-Id: I93e8245ea02ed994ebb62942d5ea4ec890e35a97 Reviewed-on: https://code.wireshark.org/review/26277 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-26Docs: Reduce our TOC depth.Gerald Combs1-0/+1
Reduce the TOC depth so that it's not quite so huge. Change-Id: I5748edf0e715961da57eff7e0ade6fad175ab24b Reviewed-on: https://code.wireshark.org/review/26110 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-14CMake: Try to avoid Strawberry Perl's xsltproc.Gerald Combs1-3/+6
Search for Chocolatey's and Cygwin's respective xsltprocs before searching %PATH%. Strawberry Perl doesn't include DocBook, which makes it useless as far as we're concerned. Another approach would be to look in various locations for an XML catalog files and set %XML_CATALOG_FILES%. However, Cygwin's /etc/xml/catalog contains Cygwin-specific URLs, e.g. file:///etc/xml/docbook and can't be used with a non-Cygwin xsltproc. Change-Id: Iaebfdff922a6574581b9bd207625f03598c166e0 Reviewed-on: https://code.wireshark.org/review/25794 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-13CMake: Install the HTML guides.Gerald Combs1-0/+33
Add a "FileInstall.cmake" module that installs files and directories. Use it to install the chunked HTML guides. Install the guides into CMAKE_INSTALL_FULL_DOCDIR. By default this is /usr/local/share/doc/Wireshark. Define DOC_DIR to match. Add explicit file and directory permissions to the default install targets. Remove the PDF install target. Bug: 14258 Change-Id: I4712a4047a54627b7520b5bf5f191e0761d19606 Reviewed-on: https://code.wireshark.org/review/25737 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12Remove Lynx.Gerald Combs2-44/+17
Use tools/html2text.py to convert HTML to text. Remove some now-obsolete documentation. Change-Id: Ib21a1ab10c789182da5fcc68e98917a00f2fa650 Reviewed-on: https://code.wireshark.org/review/25733 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-11Fix ASCIIDOCTORJ_OPTS.Gerald Combs1-1/+1
Avoid excessive quoting. Change-Id: I0dd7593d464851bd34cfc7a5a99a21a2a826dd7a Reviewed-on: https://code.wireshark.org/review/25732 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-11Switch from AsciiDoc to Asciidoctor.Gerald Combs5-354/+161
Switch the markup text processor for files in the docbook directory from AsciiDoc to Asciidoctor. Asciidoctor has several useful features (such as direct PDF output) and is actively developed. It's written in Ruby but that dependency can be sidestepped with AsciidoctorJ, a self-contained bundle that only depends on the JRE. The current toolchain targets require Python, AsciiDoc, DocBook XML, DocBook XSL, Java, FOP, xsltproc, lynx, and the HTMLHelp compiler: HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL Chunked HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL PDF: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → FOP HTMLHelp: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → HHC This change removes the AsciiDoc and FOP requirements and adds either AsciidoctorJ or Asciidoctor + Ruby: HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL Chunked HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL PDF: Asciidoctor HTMLHelp: Asciidoctor → DocBook XML → xsltproc + DocBook XSL → HHC Ideally we could generate all of these using AsciidoctorJ, Java, and lynx. Unfortunately we're not there yet. The release notes depend on several macros (ws-buglink, ws-salink, cve-idlink, sort-and-group). Add Asciidoctor (Ruby) equivalents. Remove the BUILD_xxx_GUIDES CMake options and add various output targets automatically. This means that you have to build the various documentation targets explicitly. Change-Id: I31930677a656b99b1c6839bb6c33a13db951eb9a Reviewed-on: https://code.wireshark.org/review/25668 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-04Have individual plugin CMakeLists.txt files add library dependencies.Guy Harris1-21/+2
This removes any knowledge of plugin types from cmake/modules/WiresharkPlugin.cmake, so that it doesn't have to be changed if we add a new plugin type. Revert to the second argument to add_plugin_library() and install_plugin() being the subfolder. Change-Id: I668ab90b28c73a8b12ca8e3e906b8de2f9395ca5 Reviewed-on: https://code.wireshark.org/review/25585 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-03Don't link wiretap plugins with libwireshark.Guy Harris1-3/+21
Make the second argument to add_plugin_library() and install_plugin() be a plugin type - currently, either "epan" or "wiretap" - and, based on its value, set the subfolder and required libraries in add_plugin_library() and the subfolder in install_plugin(). If it's not one of the known values, fail. Change-Id: I556863772c59330d2854fbb4673f544f8359dcd2 Reviewed-on: https://code.wireshark.org/review/25579 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-23Docbook: Generate one PDF paper size.Gerald Combs1-4/+1
Generate a single PA4-sized PDF. PA4 is the approximate intersection of A4 and Letter[1]. This gives us one less file to build and distribute. If you're printing out hard copies of the guides this wastes a few pages compared to an A4-sized PDF, but if you're printing out hard copies of the guides you've already made a strong commitment to waste paper. Page counts: Guide Size Pages WSDG A4 203 WSDG Letter 217 WSDG PA4 217 WSUG A4 192 WSUG Letter 204 WSUG PA4 205 [1] https://en.wikipedia.org/wiki/Paper_size#PA4_or_L4 Change-Id: If43d4b19947c77a51b3943a2b329dbab45025d79 Reviewed-on: https://code.wireshark.org/review/25438 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-21CMake: File copy updates.Gerald Combs1-1/+1
Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-16plugins: Add source tree subfolder for plugin libraryJoão Valverde1-10/+2
This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2018-01-15CMake: Remove incorrect commentJoão Valverde1-1/+0
Change-Id: Ie58b172f5c465d92d8100ac39cfd8c905586e9f7 Reviewed-on: https://code.wireshark.org/review/25331 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-11Use an enum for plugin types.Gerald Combs1-6/+11
Make plugins.c the source of truth for plugin names. Where plugins reside and what they do are two different things, so split the plugin directory and description into two separate elements. CMake creates portable[1] builds on Windows and macOS. That is, the build-time directory layout is the same as the installation directory layout. Adjust various plugin paths macOS accordingly. [1] You have to run osx-app.sh on macOS to prepare the application bundle, but the goal is to create a directory/bundle that can be moved or copied to a different system and run in the new location. Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743 Reviewed-on: https://code.wireshark.org/review/25166 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-28CMake: Additional default Cygwin locationGizem Yurdagul1-0/+1
On 64bit Windows, Cygwin installer sets the installation path as "C:/tools/cygwin64", add this to the set of default locations when searching for Cygwin. Change-Id: I2d6ff0dfb18f24a595583c5a9c4b05d573e05e75 Reviewed-on: https://code.wireshark.org/review/25029 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-17CMake: Replace generator expression with variableJoão Valverde1-2/+2
Should fix OSX buildbot. Change-Id: I52abdeab8c547079edc8aec6a0c6e12e928838c6 Reviewed-on: https://code.wireshark.org/review/24873 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-17plugins: Remove moduleinfo.hJoão Valverde1-0/+3
Micro version bump for mate to homogenize it between CMake and autotools. The cmake macro doesn't handle the "a" suffix and it doesn't seem worth implementing. Change-Id: Ib022c6aa170623b83a9700e4fa098c60a9cddfab Reviewed-on: https://code.wireshark.org/review/24847 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-17plugin.rc.in: Cleanup some unnecessary codeJoão Valverde1-9/+2
Also add comment noting that MSVC_VARIANT is not the same thing as CMAKE_GENERATOR. Change-Id: Icc0f4a491786e4045c650509957655ef41352b29 Reviewed-on: https://code.wireshark.org/review/24846 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-15plugins: Remove redundant plugin.rc.in filesJoão Valverde1-17/+25
plugin.rc is Windows specific, also add condition to reflect that. Change-Id: Ibbb7dab77dd1f277e2302c8f931218ca433f8c72 Reviewed-on: https://code.wireshark.org/review/24833 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-14Refactor plugin registration and loadingJoão Valverde1-2/+10
Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11Rewrite make-tap-reg.py in CJoão Valverde2-17/+15
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-03Fix the configuration check for remote-capture support in libpcap.Guy Harris1-1/+20
In autotools, if we find pcap_open(), define HAVE_PCAP_REMOTE, so we build the remote capture support. In both autotools and CMake, only check for pcap_setsampling() if we have pcap_open(), as the compile fails if we have pcap_setsampling() but don't have remote capture. Change-Id: I0e7b78a2d372ea658a19ed2f6493532928c36872 Reviewed-on: https://code.wireshark.org/review/24680 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-20Rename UseMakeDissectorReg.cmakeJoão Valverde1-8/+5
Change-Id: I2723e7f0309dbe21f23b65818fbea3a7eadf13d4 Reviewed-on: https://code.wireshark.org/review/24514 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20Rewrite make-dissector-reg.py in CJoão Valverde1-17/+6
The output compares equal to make-dissector-reg.py and the regex should be more robust (multiline, complete start of function definition). The primary motivation is to clean up the python script. This small binary results in much cleaner code. The python script is used only to generate plugin code, therefore it is renamed. Also in my casual measurements the C code is much faster (without cache) than the python script with the cache. Change-Id: Id4e8cac3c836d56775aba4819357a95ef19bcb85 Reviewed-on: https://code.wireshark.org/review/24497 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-19Fix (and chop) static build optionJoão Valverde1-1/+1
This sets the scope of the static build option to Wireshark support libraries only. Before the patch: Static plugins don't work with CMake and autotools. autotools static build is broken, and most likely will always be, as building Wireshark all-static is difficult and time-consuming. After the patch: For CMake Wireshark will be built with static or shared libraries and dynamic plugins. Everything just works. CMake apparently doesn't want you building static and shared libraries at the same time. For autotools Wireshark will be built with shared libraries by default. --disable-shared and --enable-static options work as usual. Dlopened plugins are not built if --disable-shared is given to configure (to disable shared libraries). This is a limitations imposed by libtool. Tested on Linux. This removes broken support for building plugins statically. Change-Id: Ib8e8176976f136eea93a2ce8f9857b6cf9bec64c Reviewed-on: https://code.wireshark.org/review/24241 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-19CMake: Fix error from bab9abfb7d259e1daaf84776ed9d4d09e2469293Graham Bloice1-1/+0
Fix a cut and paste error Change-Id: I28fa3644d5b7969c8009f5722f270c8fa566dd34 Reviewed-on: https://code.wireshark.org/review/24491 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-18CMake: Clean up Windows buildGraham Bloice12-40/+65
Remove options that aren't supported on Windows Don't use pkgconfig on Windows Change-Id: I79718a1c43f56a9ec88f690490931b80b727dd68 Reviewed-on: https://code.wireshark.org/review/24481 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07CMake: Detection of HTMHelpGraham Bloice1-0/+7
CMake erroneously reports that HTMLHelp wasn't found The override of FindHTMLHelp.cmake now uses FIND_PACKAGE_HANDLE_STANDARD_ARGS to do this correctly. Change-Id: I1bd24964365dea00af213092872e24cbfb5ee07d Reviewed-on: https://code.wireshark.org/review/24281 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 11:02:26 +0000