diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-30 16:54:17 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-04 11:22:38 +0100 |
| commit | 2f1c0875733d849a95c2cc5e40d2e6079ccbdec9 (patch) | |
| tree | 20f4de3caff0989dbb111821d37b6a243ccc0426 /.prev_configure.cmake | |
| parent | 88e9e88a264292ccecb5af4a0c3bdaf059b3c775 (diff) | |
CMake: Fix conditions for some subarch features
The AES and SHA features were checking for the wrong TEST_subarch_foo
variables.
Pick-to: 6.0
Task-number: QTBUG-87376
Change-Id: I46cd14d98832529aebac22cfcb01180330c5e091
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to '.prev_configure.cmake')
| -rw-r--r-- | .prev_configure.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.prev_configure.cmake b/.prev_configure.cmake index b0a133bcb3..63a9404708 100644 --- a/.prev_configure.cmake +++ b/.prev_configure.cmake @@ -761,13 +761,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) @@ -779,7 +779,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) |