Set "LZ4_PDB" instead of "LZ4_pdb" in FindLZ4.cmake so that CMake 3.16
will convert "${LZ4_DLL_DIR}/${LZ4_PDB}" to the full path to the LZ4
.pdb instead of its parent directory.
This in turn ensures that we don't pass a directory as a source argument
to `cmake -E copy_if_different`, which causes it to crash.
Bug: 16271
Change-Id: Id6f37584379bd07bc929bc5cb5e80cbe60a3c77e
Reviewed-on: https://code.wireshark.org/review/35400
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>
Update the Windows build environment to use lz4 packages built from a
VS 2017 command prompt with
set LZ4_VERSION=1.8.3
vcpkg remove lz4:x86-windows lz4:x64-windows
vcpkg install lz4:x86-windows lz4:x64-windows
vcpkg export lz4:x86-windows --output=lz4-%LZ4_VERSION%-win32ws --zip
vcpkg export lz4:x64-windows --output=lz4-%LZ4_VERSION%-win64ws --zip
The packages also include a PDB, so copy it to the build directory and
add it to the PDB .zip.
Change-Id: Icea512405d2085e5b271fa4a3ba8c0fe318b8cb5
Reviewed-on: https://code.wireshark.org/review/32785
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>
Most CMake find modules report the binary found, the modules
fixed by this change represent an inconsistent exception.
The first REQUIRED_VAR argument to
find_package_handle_standard_args() is the one used by CMake
to report on the result of find_package().
Compare (master)
-- Found SNAPPY: /usr/include
to (this change)
-- Found SNAPPY: /usr/lib/x86_64-linux-gnu/libsnappy.so
This convention of using XXX_LIBRARY matches upstream practice.
Change-Id: Iaa0ec644e963430d73722354f6ee2a3694906ba7
Reviewed-on: https://code.wireshark.org/review/31498
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
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>
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>
Gerald Combs