diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-21 17:18:35 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-22 14:34:47 +0200 |
| commit | dc4bc1e575a6e085f76200f9e4b96c6fb84cf313 (patch) | |
| tree | 4b4876ae07974ebe91d4e22426ff6637a28468ba /cmake | |
| parent | 8a56b4ad9bcbafefd8de0caf102c300b7771e57b (diff) | |
CMake: Fix interleaved configure output
message(STATUS) prints output to a buffered stdout, whereas
message(NOTICE) or just message() print to unbuffered stderr.
We use a mix of message() calls when printing the configuration
summary, which caused interleaved output.
Because CMake offers no message(FLUSH), we work around the issue
by calling execute_process(COMMAND -E echo " ") which does
call std::cout << s << std::flush;
We seem to have to do it twice, before and after the
detailed configuration summary is printed.
Pick-to: 6.2 6.3
Change-Id: Ibc075551fc0547073f0696477e54d9b9c1edca97
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInformation.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index 9676d5db78..a55b9310e2 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -98,7 +98,12 @@ function(qt_configure_print_summary) "-- Configure with --log-level=STATUS or higher to increase the output verbosity.") endif() + # Need 2 flushes to ensure no interleaved input is printed due to a mix of message(STATUS) + # and message(NOTICE) calls. + execute_process(COMMAND ${CMAKE_COMMAND} -E echo " ") message(STATUS "Configure summary:\n${__qt_configure_reports}") + execute_process(COMMAND ${CMAKE_COMMAND} -E echo " ") + file(APPEND "${summary_file}" "${__qt_configure_reports}") endif() if(__qt_configure_notes) |