From 51f3a9b6a497361495178ee8f03653dbe7df9ca0 Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Mon, 28 Oct 2024 19:39:11 +0100 Subject: [PATCH] Bump zlib --- build/build_zlib.py | 6 +++--- fmusim-gui/CMakeLists.txt | 2 +- fmusim-gui/build/build_zlib.py | 6 +++--- fmusim/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build_zlib.py b/build/build_zlib.py index 2e7353be..7d942148 100644 --- a/build/build_zlib.py +++ b/build/build_zlib.py @@ -18,8 +18,8 @@ ) args, _ = parser.parse_known_args() -archive = download_file('https://www.zlib.net/fossils/zlib-1.3.tar.gz', - checksum='ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e') +archive = download_file('https://www.zlib.net/fossils/zlib-1.3.1.tar.gz', + checksum='9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23') root = Path(__file__).parent @@ -68,7 +68,7 @@ cmake_args + ['-B', build_dir, '-D', f'CMAKE_INSTALL_PREFIX={ install_prefix }', - root / 'zlib-1.3'] + root / 'zlib-1.3.1'] ) check_call([ diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt index 4bb1e0be..f875287d 100644 --- a/fmusim-gui/CMakeLists.txt +++ b/fmusim-gui/CMakeLists.txt @@ -14,7 +14,7 @@ set(CVODE_DIR ${CMAKE_SOURCE_DIR}/build/cvode-x86_64-windows/install) set(LIBXML2_DIR ${CMAKE_SOURCE_DIR}/build/libxml2-x86_64-windows/install) set(ZLIB_DIR ${CMAKE_SOURCE_DIR}/build/zlib-x86_64-windows/install) -set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3) +set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3.1) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets) diff --git a/fmusim-gui/build/build_zlib.py b/fmusim-gui/build/build_zlib.py index 57673512..18608f49 100644 --- a/fmusim-gui/build/build_zlib.py +++ b/fmusim-gui/build/build_zlib.py @@ -4,8 +4,8 @@ from fmpy.util import download_file -archive = download_file('https://www.zlib.net/fossils/zlib-1.3.tar.gz', - checksum='ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e') +archive = download_file('https://www.zlib.net/fossils/zlib-1.3.1.tar.gz', + checksum='9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23') root = Path(__file__).parent @@ -26,7 +26,7 @@ cmake_args + ['-B', build_dir, '-D', f'CMAKE_INSTALL_PREFIX={ install_prefix }', - str(root / 'zlib-1.3')] + str(root / 'zlib-1.3.1')] ) check_call([ diff --git a/fmusim/CMakeLists.txt b/fmusim/CMakeLists.txt index 298144e1..af758e4b 100644 --- a/fmusim/CMakeLists.txt +++ b/fmusim/CMakeLists.txt @@ -15,7 +15,7 @@ set(FMUSIM_VERSION "" CACHE STRING "") set(CVODE_DIR ${CMAKE_SOURCE_DIR}/build/cvode-${FMI_PLATFORM}/install/) set(LIBXML2_DIR ${CMAKE_SOURCE_DIR}/build/libxml2-${FMI_PLATFORM}/install/) set(ZLIB_DIR ${CMAKE_SOURCE_DIR}/build/zlib-${FMI_PLATFORM}/install/) -set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3/) +set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3.1/) if (WIN32) set(FMUSIM_DIST_DIR ${CMAKE_BINARY_DIR}/dist/fmusim-windows/)