diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2025-05-19 17:47:20 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2025-05-20 10:34:00 +0200 |
| commit | 990e09cf522f3a1ea4145960b7766a81e9b70b27 (patch) | |
| tree | ecc34fbc7585d7f573bcddf610221095e44ff17f | |
| parent | d6bb55bf83efef942503cd4bd4e6874f8ecdc8c6 (diff) | |
Add better way to avoid native qtwebenignecore builds on WoA
Do not use cmake config files to skip native arm builds due
to poor CI capacity. Instead use module_config.
Task-number: COIN-1211
Pick-to: 6.9
Change-Id: Ic7f3fa953331197026eef2f39990319d4c0c6dcf
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 7 | ||||
| -rw-r--r-- | configure.cmake | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 6ca6b00e9..1227dc4d6 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -19,6 +19,13 @@ instructions: enable_if: condition: runtime env_var: COIN_PLATFORM_ID + contains_value: "windows-11_22h2-arm64-msvc2022" + - type: AppendToEnvironmentVariable + variableName: COMMON_NON_QTBASE_CMAKE_ARGS + variableValue: " -DFEATURE_qtwebengine_build=OFF" + enable_if: + condition: runtime + env_var: COIN_PLATFORM_ID contains_value: "windows-11_24H2-msvc2022-arm64" - type: AppendToEnvironmentVariable variableName: COMMON_NON_QTBASE_CMAKE_ARGS diff --git a/configure.cmake b/configure.cmake index 66ec6035a..9cdd898bf 100644 --- a/configure.cmake +++ b/configure.cmake @@ -287,17 +287,9 @@ foreach(target_to_check ${targets_to_check}) endforeach() unset(targets_to_check) -if(WIN32 AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")) - set(WIN_ARM_64 ON) -else() - set(WIN_ARM_64 OFF) -endif() - qt_webengine_configure_check("supported-platform" MODULES QtWebEngine - CONDITION LINUX OR (WIN32 AND CMAKE_CROSSCOMPILING) OR - (WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS + CONDITION LINUX OR WIN32 OR MACOS MESSAGE "Build can be done only on Linux, Windows or macOS." ) qt_webengine_configure_check("supported-platform" |