diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-30 16:54:17 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-04 13:07:49 +0000 |
| commit | 3d61869885480342f84510de03cf2deb71783e87 (patch) | |
| tree | 075eb37452926eb00523ea58a2004c2fa8d7084e /configure.cmake | |
| parent | 8e57a0ef37e04f6008be04bfa77f9045d93b8f08 (diff) | |
CMake: Fix conditions for some subarch features
The AES and SHA features were checking for the wrong TEST_subarch_foo
variables.
Task-number: QTBUG-87376
Change-Id: I46cd14d98832529aebac22cfcb01180330c5e091
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 2f1c0875733d849a95c2cc5e40d2e6079ccbdec9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake index 0aceaaf905..d65341aa1a 100644 --- a/configure.cmake +++ b/configure.cmake @@ -774,13 +774,13 @@ qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1") qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG) qt_feature("aesni" LABEL "AES" - CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes + CONDITION QT_FEATURE_sse2 AND TEST_subarch_aesni ) qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1") qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG) qt_feature("rdrnd" LABEL "RDRAND" - CONDITION TEST_subarch_rdseed + CONDITION TEST_subarch_rdrnd ) qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1") qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG) @@ -792,7 +792,7 @@ qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1") qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG) qt_feature("shani" LABEL "SHA" - CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha + CONDITION QT_FEATURE_sse2 AND TEST_subarch_shani ) qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1") qt_feature_config("shani" QMAKE_PRIVATE_CONFIG) |