lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2025-12-21 07:28:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set ZLIB_ROOT on Windows with MSVC

Browse Source 
That is required for qtopenapi builds that would be enabled in the
follow-up patch.

The zlib library is already built after commit
97e80c1538. 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 <toni.saario@qt.io>
This commit is contained in:
Ivan Solovev
2025-10-27 15:29:57 +01:00
parent ea8bd40e3d
commit aecfc7e23b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms.yaml
View File

@@ -182,6 +182,7 @@ Configurations:
'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
] ]
- -
Id: 'windows-11_24H2-msvc2022' Id: 'windows-11_24H2-msvc2022'
@@ -197,6 +198,7 @@ Configurations:
'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
] ]
- -
Id: 'windows-11_23h2-arm64-msvc2022' Id: 'windows-11_23h2-arm64-msvc2022'
@@ -211,6 +213,7 @@ Configurations:
'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_ARM64}}',
] ]
- -
Id: 'windows-11_24H2-msvc2022-arm64' Id: 'windows-11_24H2-msvc2022-arm64'
@@ -253,6 +256,7 @@ Configurations:
'VCPKG_HOST_TRIPLET=x64-windows-qt', 'VCPKG_HOST_TRIPLET=x64-windows-qt',
'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
] ]
- -
Id: 'rhel-8.10' Id: 'rhel-8.10'