URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7fa8215febfc51dbce288e6f9c15c63d45fc8360
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
7fa8215 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Windows: Use a c-ares DLL built with vcpkg.
Update the Windows build environment to use c-ares packages built from
a VS 2017 command prompt with
set CARES_VERSION=1.15.0
vcpkg install c-ares:x86-windows c-ares:x64-windows
vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip
vcpkg export c-ares:x64-windows --output=c-ares-%CARES_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: I1887ca89d897bea184144315219b366096519961
Reviewed-on: https://code.wireshark.org/review/31376
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 33a8f5e gitlab-ci: do not build the all target when invoking rpm-package
add 7fa8215 Windows: Use a c-ares DLL built with vcpkg.
Summary of changes:
CMakeLists.txt | 13 ++++++++++++-
cmake/modules/FindCARES.cmake | 11 ++++++++---
cmake/modules/FindWSWinLibs.cmake | 7 ++++++-
tools/win-setup.ps1 | 8 ++++----
4 files changed, 30 insertions(+), 9 deletions(-)