From bce8658c72bde7951a25740d5443c94b3a557a20 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 2 Sep 2024 13:36:18 +0300 Subject: [PATCH] Restore WoA cross-compile build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-128554 Pick-to: 6.8 Change-Id: I53cd170a1f63299dee0d59ddb92f38e30d214043 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 99c372f6243..31f35c37688 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -163,6 +163,22 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23H2-msvc2022-arm64' + Template: 'qtci-windows-11_23H2-x86_64-53' + Compiler: 'MSVC2022' + Target arch: 'arm64' + Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Platform dependency: 'windows-11_23H2-msvc2022' + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', + 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50'