diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-01 17:31:41 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-01 22:27:06 +0200 |
| commit | 6f6bd2c4dc0d958afe7f43f5ba9bec2b71606f77 (patch) | |
| tree | 14de935d2843a1f85851827d3061007eae5effce /cmake | |
| parent | 6f529c38ce9fcd94fc7ef74d4a1a51cb3b0cf463 (diff) | |
Set QT_FORCE_FEATURE_neon to ON for x86_64h arch as well, on macOS
We were not accounting for `x86_64h` arch, and as a result
cross-compiling with `-DCMAKE_OSX_ARCHITECTURES="x86_64h;arm64`
was failing.
Pick-to: 6.5
Fixes: QTBUG-113694
Change-Id: Ieb50a7a62aabcca76b09f9c853b3faf915eab1a3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 293eca95a3..5ac19a9ba3 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -101,7 +101,8 @@ if(MACOS AND QT_IS_MACOS_UNIVERSAL QT_FEATURE_x86intrin) endif() -if(MACOS AND QT_IS_MACOS_UNIVERSAL AND __qt_osx_first_arch STREQUAL "x86_64") +if(MACOS AND QT_IS_MACOS_UNIVERSAL AND + (__qt_osx_first_arch STREQUAL "x86_64" OR __qt_osx_first_arch STREQUAL "x86_64h")) set(QT_FORCE_FEATURE_neon ON CACHE INTERNAL "Force enable neon due to platform requirements.") set(__QtFeature_custom_enabled_cache_variables TEST_subarch_neon |