summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-02-23 18:06:21 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-24 12:28:46 +0000
commit649f75167d80f3e72a7d078c4e3a2ed15d55a13e (patch)
treed82826309263335c8d32a750b674e5b9b2bf0087
parent36eddd221a6be60528db51e66f2b9320de6edb65 (diff)
Avoid enabling qt3d-simd-avx2 if avx feature is disabled in qtbase
Make the qt3d-simd-avx2 feature dependent on the avx2 feature. Fixes: QTBUG-101176 Change-Id: Id056f383a4781dc4318b985631ebee46bb4b7961 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3fce3beeb2d1f78020a9dbde9fc7de8d8b0bd8d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/configure.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/configure.cmake b/src/core/configure.cmake
index e8c05ef53..be9b63cc5 100644
--- a/src/core/configure.cmake
+++ b/src/core/configure.cmake
@@ -76,6 +76,7 @@ qt_feature("qt3d-simd-avx2" PRIVATE
LABEL "Use AVX2 instructions"
PURPOSE "Use AVX2 SIMD instructions to accelerate matrix operations"
AUTODETECT TEST_arch_${TEST_architecture_arch}_subarch_avx2
+ CONDITION QT_FEATURE_avx2
ENABLE INPUT_qt3d_simd STREQUAL 'avx2'
DISABLE INPUT_qt3d_simd STREQUAL 'sse2' OR INPUT_qt3d_simd STREQUAL 'no' OR ( TEST_architecture_arch STREQUAL i386 )
)