Wireshark-commits: [Wireshark-commits] master ba40851: Windows: Use an lz4 DLL built with vcpkg.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ba40851b277a04b126767583df5122eb51e38e0a
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
ba40851 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Windows: Use an lz4 DLL built with vcpkg.
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@xxxxxxxxxxxxx>
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from f3ef857 ieee80211: fix wrong offset for mesh configuration capability bitmask
add ba40851 Windows: Use an lz4 DLL built with vcpkg.
Summary of changes:
CMakeLists.txt | 1 +
cmake/modules/FindLZ4.cmake | 10 ++++++++--
tools/win-setup.ps1 | 8 ++++----
3 files changed, 13 insertions(+), 6 deletions(-)