From eb8da02d055f8f761880da33b02342ca2d69b1a5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 1 Jul 2022 15:00:50 +0200 Subject: [PATCH] CMake: Improve 'Generating Plugins' message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use message(STATUS) for the 'Generating Plugins' message. This way it will go to stdout instead of stderr, which follows the convention we have for most of our other messages. Also list only the modules that actually have plugins, rather than all known modules. Pick-to: 6.2 6.3 6.4 Change-Id: I1ea0ed71418ede54790cabd32e03e82fc69f2858 Reviewed-by: Jörg Bornemann --- cmake/QtPostProcessHelpers.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index cac26d88c5..544f02c9d8 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -411,7 +411,7 @@ function(qt_internal_create_plugins_files) endif() qt_internal_get_qt_repo_known_modules(repo_known_modules) - message("Generating Plugins files for ${repo_known_modules}...") + set(modules_with_plugins "") foreach (QT_MODULE ${repo_known_modules}) get_target_property(target_type "${QT_MODULE}" TYPE) if(target_type STREQUAL "INTERFACE_LIBRARY") @@ -463,6 +463,7 @@ endif()") get_target_property(qt_plugins "${QT_MODULE}" QT_PLUGINS) if(qt_plugins OR QT_MODULE_PLUGIN_INCLUDES) + list(APPEND modules_with_plugins "${QT_MODULE}") configure_file( "${QT_CMAKE_DIR}/QtPlugins.cmake.in" "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}Plugins.cmake" @@ -475,6 +476,10 @@ endif()") ) endif() endforeach() + if(modules_with_plugins) + message(STATUS "Generated QtModulePlugins.cmake files for the following modules:" + " ${modules_with_plugins}") + endif() endfunction() function(qt_generate_install_prefixes out_var)