summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/QtBuildInformation.cmake5
-rw-r--r--cmake/QtFeature.cmake4
2 files changed, 7 insertions, 2 deletions
diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake
index 3fc5417909..7ad83db036 100644
--- a/cmake/QtBuildInformation.cmake
+++ b/cmake/QtBuildInformation.cmake
@@ -362,6 +362,11 @@ function(qt_configure_add_report_entry)
qt_configure_record_command(ADD_REPORT_ENTRY ${ARGV})
endfunction()
+function(qt_configure_add_report_error error)
+ message(SEND_ERROR "${error}")
+ qt_configure_add_report_entry(TYPE ERROR MESSAGE "${error}" CONDITION TRUE)
+endfunction()
+
function(qt_configure_process_add_report_entry)
qt_parse_all_arguments(arg "qt_configure_add_report_entry"
""
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
index 72b4001d57..58b46c4660 100644
--- a/cmake/QtFeature.cmake
+++ b/cmake/QtFeature.cmake
@@ -274,8 +274,8 @@ macro(qt_feature_set_value feature cache condition label conditionExpression)
if (NOT (condition) AND (cache))
_qt_internal_dump_expression_values(conditionDump "${conditionExpression}")
string(JOIN " " conditionString ${conditionExpression})
- message(SEND_ERROR "Feature \"${feature}\": Forcing to \"${cache}\" breaks its condition:\
-\n ${conditionString}\nCondition values dump:\n ${conditionDump}\n")
+ qt_configure_add_report_error("Feature \"${feature}\": Forcing to \"${cache}\" breaks its \
+condition:\n ${conditionString}\nCondition values dump:\n ${conditionDump}\n")
endif()
if (DEFINED "QT_FEATURE_${feature}")