From e167d1f4cdca72fba44da75d74882a2fcbbec800 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 4 Jun 2026 15:12:04 +0200 Subject: [PATCH] coin: Use OHOS_ARCH instead of OHOS_ABI in CI config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation of consolidating the OHOS target-architecture variables onto OHOS_ARCH and droppeding OHOS_ABI, we're updating the HarmonyOS target platform configs to pass -DOHOS_ARCH=arm64-v8a. This doesn't change behavior, because OHOS_ABI defaults to arm64-v8a. Task-number: QTBUG-147291 Change-Id: I1d0d2071d0512f976eaa031d7c976aa97c3bc9cb Reviewed-by: Simo Fält (cherry picked from commit 3275891741fd58d9288d5b3c37c1e275770d6a11) --- coin/platform_configs/cmake_platforms_target_harmonyos.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_harmonyos.yaml b/coin/platform_configs/cmake_platforms_target_harmonyos.yaml index e14e4854..a99bd06b 100644 --- a/coin/platform_configs/cmake_platforms_target_harmonyos.yaml +++ b/coin/platform_configs/cmake_platforms_target_harmonyos.yaml @@ -11,7 +11,7 @@ Configurations: Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -nomake examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime', - 'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ABI=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', + 'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', 'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw' @@ -27,7 +27,7 @@ Configurations: Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-developer-build -debug -no-dbus -no-use-gold-linker -no-pch -openssl-runtime', - 'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ABI=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', + 'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}', 'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'