Wireshark-commits: [Wireshark-commits] master acc96e5: Windows: Start using a `vcpkg export` bundle
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=acc96e5206ca731c791dcae537fc7ae3a08b4e65
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
acc96e5 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Windows: Start using a `vcpkg export` bundle.
Create a library bundle using `vcpkg export ... --zip` as described at
https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command.
The bundle includes the following packages:
gettext 0.19-8
glib 2.52.3-13
libffi 3.1-4
libiconv 1.15-5
liblzma 5.2.4
libxml2 2.9.9-4
pcre 8.41-1
zlib 1.2.11-5
It also includes a CMake toolchain file which we might want to make use
of in the future.
This means we no longer compile Zlib locally. Update the CMake environment
accordingly and remove zlib from win-setup.ps1.
It includes PDBs, so add them to the PDB .zip.
Change-Id: I0a94904a86d836e990019dab62af506573be1f35
Reviewed-on: https://code.wireshark.org/review/31377
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from f57a73d rtps: fix ipv4 address prints.
add acc96e5 Windows: Start using a `vcpkg export` bundle.
Summary of changes:
CMakeLists.txt | 45 ++++++++++++-------------------------
cmake/modules/FindGLIB2.cmake | 47 ++++++++++++++++++++++++++++-----------
cmake/modules/FindGMODULE2.cmake | 2 +-
cmake/modules/FindGTHREAD2.cmake | 2 +-
cmake/modules/FindLibXml2.cmake | 4 ++--
cmake/modules/FindWSWinLibs.cmake | 45 ++++++++++++++++++++++++++++++++++++-
cmake/modules/FindZLIB.cmake | 33 ++++++++-------------------
tools/win-setup.ps1 | 12 ++++------
8 files changed, 109 insertions(+), 81 deletions(-)
