From 6f6bd2c4dc0d958afe7f43f5ba9bec2b71606f77 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 1 Jun 2023 17:31:41 +0200 Subject: [PATCH] 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 --- cmake/QtBaseGlobalTargets.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 293eca95a32..5ac19a9ba33 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