diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-04-08 10:02:52 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-04-09 04:28:36 +0000 |
| commit | ba40851b277a04b126767583df5122eb51e38e0a (patch) | |
| tree | 99bb83ed833f0be9a1255bca90fbcb2a99d6b94a /cmake | |
| parent | f3ef8575d4620a62f1c4609bf14961c3e78993f3 (diff) | |
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@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindLZ4.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/modules/FindLZ4.cmake b/cmake/modules/FindLZ4.cmake index dba69f5968..dcf727fe08 100644 --- a/cmake/modules/FindLZ4.cmake +++ b/cmake/modules/FindLZ4.cmake @@ -52,13 +52,19 @@ if( LZ4_FOUND ) CACHE PATH "Path to LZ4 DLL" ) file( GLOB _lz4_dll RELATIVE "${LZ4_DLL_DIR}" - "${LZ4_DLL_DIR}/liblz4*.dll" + "${LZ4_DLL_DIR}/lz4*.dll" ) set ( LZ4_DLL ${_lz4_dll} # We're storing filenames only. Should we use STRING instead? CACHE FILEPATH "LZ4 DLL file name" ) - mark_as_advanced( LZ4_DLL_DIR LZ4_DLL ) + file( GLOB _lz4_pdb RELATIVE "${LZ4_DLL_DIR}" + "${LZ4_DLL_DIR}/lz4*.pdb" + ) + set ( LZ4_pdb ${_lz4_pdb} + CACHE FILEPATH "LZ4 PDB file name" + ) + mark_as_advanced( LZ4_DLL_DIR LZ4_DLL LZ4_PDB ) endif() else() set( LZ4_INCLUDE_DIRS ) |