From aecfc7e23b16eed0980f25e0b198a8fab1fea1b6 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 27 Oct 2025 15:29:57 +0100 Subject: [PATCH] Set ZLIB_ROOT on Windows with MSVC That is required for qtopenapi builds that would be enabled in the follow-up patch. The zlib library is already built after commit 97e80c153803d5c466215b811b29f57fd088a308. That commit also sets the ZLIB_PATH_{arch} environment variables. So, we only need to set ZLIB_ROOT to point to the proper zlib installation. This patch does not cover llvm and mingw configurations, because we need to builds zlib using these compilers first. Task-number: QTBUG-138968 Change-Id: I5d5ad754d13bef9fc6184b41823a42d98863991a Reviewed-by: Toni Saario --- coin/platform_configs/cmake_platforms.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 789d409f..4888d035 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -182,6 +182,7 @@ Configurations: 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', + 'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}', ] - Id: 'windows-11_24H2-msvc2022' @@ -197,6 +198,7 @@ Configurations: 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', + 'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}', ] - Id: 'windows-11_23h2-arm64-msvc2022' @@ -211,6 +213,7 @@ Configurations: 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', + 'ZLIB_ROOT={{.Env.ZLIB_PATH_ARM64}}', ] - Id: 'windows-11_24H2-msvc2022-arm64' @@ -253,6 +256,7 @@ Configurations: 'VCPKG_HOST_TRIPLET=x64-windows-qt', 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', + 'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}', ] - Id: 'rhel-8.10'