summaryrefslogtreecommitdiffstats
path: root/cmake/QtFeature.cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-01-14 18:28:57 +0100
committerAlexey Edelev <alexey.edelev@qt.io>2021-01-15 15:25:18 +0100
commit8d76903b9746a26945973391acc119e31f8d2fb8 (patch)
tree523bc8a4630696b963d76d50f364bf85131adf68 /cmake/QtFeature.cmake
parent154573929a76d9051920756b19ed033c4b2ac649 (diff)
Fix missed feature evaluation errors in report
Add an optional argument to store the report command while feature evaluation-only stage. This is necessary, because according to the actual feature evaluation process, evaluation happens only once and it's impossible to record any command during the evaluation-only stage. Fixes: QTBUG-90319 Change-Id: I215fbe0a28a2661cd2d97d253b2e2c787d295cbd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jason McDonald <macadder1@gmail.com>
Diffstat (limited to 'cmake/QtFeature.cmake')
-rw-r--r--cmake/QtFeature.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
index 58b46c4660..b0f6352449 100644
--- a/cmake/QtFeature.cmake
+++ b/cmake/QtFeature.cmake
@@ -275,7 +275,7 @@ macro(qt_feature_set_value feature cache condition label conditionExpression)
_qt_internal_dump_expression_values(conditionDump "${conditionExpression}")
string(JOIN " " conditionString ${conditionExpression})
qt_configure_add_report_error("Feature \"${feature}\": Forcing to \"${cache}\" breaks its \
-condition:\n ${conditionString}\nCondition values dump:\n ${conditionDump}\n")
+condition:\n ${conditionString}\nCondition values dump:\n ${conditionDump}\n" RECORD_ON_FEATURE_EVALUATION)
endif()
if (DEFINED "QT_FEATURE_${feature}")