diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-09 18:52:56 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-13 21:13:39 +0000 |
| commit | 1bdeb16e398032869ffb249e41c375919c5aa8db (patch) | |
| tree | d19838b5b411e4b47a8b640ff7f6b54e9d356a48 /cmake | |
| parent | 5c48c22a3feabb7ad2cb065ea6e1e59e77c5e39f (diff) | |
CMake: Ensure top-level builds are affected by our chosen log level
This will hide the configuration summary and cmake feature summary and
found packages output upon reconfiguration.
Task-number: QTBUG-104128
Change-Id: I42270b99e45076052ec176df4652661cae10ac0c
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit b3d0325a8dca56d3163451a417edfe6015a4ffe0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInformation.cmake | 18 | ||||
| -rw-r--r-- | cmake/QtSetup.cmake | 26 |
2 files changed, 33 insertions, 11 deletions
diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index bb611f4f0e..1d9dc79057 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -1,4 +1,13 @@ function(qt_print_feature_summary) + if(QT_SUPERBUILD) + qt_internal_set_message_log_level(message_log_level) + if(message_log_level) + # In a top-level build, ensure that the feature_summary is affected by the + # selected log-level. + set(CMAKE_MESSAGE_LOG_LEVEL "${message_log_level}") + endif() + endif() + include(FeatureSummary) # Show which packages were found. feature_summary(INCLUDE_QUIET_PACKAGES @@ -19,6 +28,15 @@ function(qt_print_build_instructions) return() endif() + if(QT_SUPERBUILD) + qt_internal_set_message_log_level(message_log_level) + if(message_log_level) + # In a top-level build, ensure that qt_print_build_instructions is affected by the + # selected log-level. + set(CMAKE_MESSAGE_LOG_LEVEL "${message_log_level}") + endif() + endif() + set(build_command "cmake --build . --parallel") set(install_command "cmake --install .") diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index ccfc2c5ecd..15d9bbecdc 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -23,18 +23,22 @@ if(FEATURE_developer_build) set(_default_build_type "Debug") endif() -# Decide whether output should be verbose or not. -# Default to verbose (--log-level=STATUS) in a developer-build and -# non-verbose (--log-level=NOTICE) otherwise. -# If a custom CMAKE_MESSAGE_LOG_LEVEL was specified, it takes priority. -# Passing an explicit --log-level=Foo has the highest priority. -if(NOT CMAKE_MESSAGE_LOG_LEVEL) - if(FEATURE_developer_build OR QT_FEATURE_developer_build) - set(CMAKE_MESSAGE_LOG_LEVEL "STATUS") - else() - set(CMAKE_MESSAGE_LOG_LEVEL "NOTICE") +function(qt_internal_set_message_log_level out_var) + # Decide whether output should be verbose or not. + # Default to verbose (--log-level=STATUS) in a developer-build and + # non-verbose (--log-level=NOTICE) otherwise. + # If a custom CMAKE_MESSAGE_LOG_LEVEL was specified, it takes priority. + # Passing an explicit --log-level=Foo has the highest priority. + if(NOT CMAKE_MESSAGE_LOG_LEVEL) + if(FEATURE_developer_build OR QT_FEATURE_developer_build) + set(CMAKE_MESSAGE_LOG_LEVEL "STATUS") + else() + set(CMAKE_MESSAGE_LOG_LEVEL "NOTICE") + endif() + set(${out_var} "${CMAKE_MESSAGE_LOG_LEVEL}" PARENT_SCOPE) endif() -endif() +endfunction() +qt_internal_set_message_log_level(CMAKE_MESSAGE_LOG_LEVEL) # Reset content of extra build internal vars for each inclusion of QtSetup. unset(QT_EXTRA_BUILD_INTERNALS_VARS) |