1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Don't claim we have printed the summary on log level < STATUS

Browse Source 
If the log level is below status we don't print the configuration
summary, and configure should not claim that.

Check whether the log level is sufficient for printing the summary and
only then state that the summary will be printed.

Change-Id: I0118941dfbc29c8a9909421cec57660f6110df34
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2024-01-08 13:57:10 +01:00
parent 438837ce27
commit f83ec0c76b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/QtBuildInformation.cmake
View File

@ -162,11 +162,23 @@ function(qt_configure_print_summary)
# Show Qt-specific configuration summary.
if(__qt_configure_reports)
# The summary will only be printed for log level STATUS or above.
# Check whether the log level is sufficient for printing the summary.
set(log_level_sufficient_for_printed_summary TRUE)
if(CMAKE_VERSION GREATER_EQUAL "3.25")
cmake_language(GET_MESSAGE_LOG_LEVEL log_level)
set(sufficient_log_levels STATUS VERBOSE DEBUG TRACE)
if(NOT log_level IN_LIST sufficient_log_levels)
set(log_level_sufficient_for_printed_summary FALSE)
endif()
endif()
# We want to show the configuration summary file and log level message only on
# first configuration or when we detect a feature change, to keep most
# reconfiguration output as quiet as possible.
# Currently feature change detection is not entirely reliable.
if(NOT QT_INTERNAL_SUMMARY_INSTRUCTIONS_SHOWN OR features_possibly_changed)
if(log_level_sufficient_for_printed_summary
AND (NOT QT_INTERNAL_SUMMARY_INSTRUCTIONS_SHOWN OR features_possibly_changed))
set(force_show_summary TRUE)
message(
"\n"