From 9260fd33e81193f40c04ac2599dab2cda335b056 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 12 Dec 2025 20:04:58 +0200 Subject: [PATCH] Remove unneeded VCPKG parameters in 6.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These variables were mistakenly merged into 6.10 - VCPKG_HOST_TRIPLET - VCPKG_TARGET_TRIPLET In these - 91627c3294fb15b987f009e696dd20dd282cec5f - b36caafbb002331257c8297c6262a3ff5698a80e As in 6.10 those variables should not be used, but it's easy that they get there via cherry-picks. Task-number: QTQAINFRA-7273 Task-number: QTQAINFRA-7463 Change-Id: Ic4444b787207302778e8c6f93e91343be97f81f2 Reviewed-by: Ville-Pekka Karhu Reviewed-by: Aku Pietikäinen --- coin/platform_configs/cmake_platforms.yaml | 2 -- coin/platform_configs/cmake_platforms_static_release.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index a7f7edd4..ef3a15c2 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -195,8 +195,6 @@ Configurations: 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index d0f2e18f..68a635ff 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -22,8 +22,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', - 'VCPKG_HOST_TRIPLET=arm64-windows-qt', - 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] -