diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-12-02 16:10:47 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-12-02 16:12:57 +0000 |
| commit | 4adaeee0eb1e3226572f677a674b909e72e28a57 (patch) | |
| tree | 7894f2a29ab50910cb5ae25fd603eece7f48baa6 | |
| parent | bf88197d94bf6045cf789a1aa332a8c88755556f (diff) | |
Win32: update the zlib 1.2.11 CMake file
- get rid of the CMP0048 deprecation warning
- fix the absolute install path (João Valverde)
Change-Id: If2353987483b17b38a43a2400b97f1446c312e28
Reviewed-on: https://code.wireshark.org/review/30886
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22ed9930ea..983143da7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -996,7 +996,7 @@ endif() if(ENABLE_ZLIB) if (WIN32) # On Windows we build our own version of zlib, so add the paths - set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.11-1-ws") + set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.11-2-ws") set(SKIP_INSTALL_STATIC True) set(SKIP_INSTALL_HEADERS True) set(SKIP_INSTALL_FILES True) diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 5cc482bec6..530eca50fc 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -69,8 +69,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2018-11-29" -$Win32CurrentTag = "2018-11-29" +$Win64CurrentTag = "2018-12-02" +$Win32CurrentTag = "2018-12-02" # Archive file / SHA256 $Win64Archives = @{ @@ -93,7 +93,7 @@ $Win64Archives = @{ "spandsp-0.0.6-1-win64ws.zip" = "0e46c61a5a8dca562c36e88a8962a50c1ec1a9fcf89dd05996dac5a79e454527"; "WinSparkle-0.5.7.zip" = "56d396ef0c4e8b0589ea74134e484376ca6459d972cd1ab1da6b9624d82e6d04"; "WpdPack_4_1_2.zip" = "ea799cf2f26e4afb1892938070fd2b1ca37ce5cf75fec4349247df12b784edbd"; - "zlib-1.2.11-1-ws.zip" = "2f54edfb848b4750f4eb1e0c35af0eaa4bd6ec5650f101016707b55d71da7549"; + "zlib-1.2.11-2-ws.zip" = "82764f71649cdc1e5467686289936ca7f632966186e2fce35df94037e4ecb596"; } $Win32Archives = @{ @@ -116,7 +116,7 @@ $Win32Archives = @{ "spandsp-0.0.6-1-win32ws.zip" = "3c25f2f4d641d4257ec9922f6db77346a8eed2e360e7d0e27b828ade19c4705b"; "WinSparkle-0.5.7.zip" = "56d396ef0c4e8b0589ea74134e484376ca6459d972cd1ab1da6b9624d82e6d04"; "WpdPack_4_1_2.zip" = "ea799cf2f26e4afb1892938070fd2b1ca37ce5cf75fec4349247df12b784edbd"; - "zlib-1.2.11-1-ws.zip" = "2f54edfb848b4750f4eb1e0c35af0eaa4bd6ec5650f101016707b55d71da7549"; + "zlib-1.2.11-2-ws.zip" = "82764f71649cdc1e5467686289936ca7f632966186e2fce35df94037e4ecb596"; } # Subdirectory to extract an archive to |