From 70c3dd4a54d3b72076bfc2edbd66fd5ccf0e3b28 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 23 Mar 2022 16:24:16 +0100 Subject: [PATCH] CMake: Enable verbose autogen for cmake auto tests and EP examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So we can see the exact moc invocations when debugging issues in the CI. For ExternalProject examples, it is conditional on whether Qt is configured with QT_INTERNAL_VERBOSE_EXAMPLES set to ON, otherwise calling the main ninja without -v will end up cluttering the output with AUTOGEN output. Pick-to: 6.2 6.3 Change-Id: I6468ab0e461b3be283e2428e3515cae4d5986242 Reviewed-by: Jörg Bornemann --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 1 + src/corelib/Qt6CTestMacros.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 279abdb8a0b..5dcfdbe0cb7 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1049,6 +1049,7 @@ function(qt_internal_add_example_external_project subdir) if(QT_INTERNAL_VERBOSE_EXAMPLES) list(APPEND var_defs -DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG) + list(APPEND var_defs -DCMAKE_AUTOGEN_VERBOSE:BOOL=TRUE) endif() set(deps "") diff --git a/src/corelib/Qt6CTestMacros.cmake b/src/corelib/Qt6CTestMacros.cmake index e7eaa3c26bb..05130a15554 100644 --- a/src/corelib/Qt6CTestMacros.cmake +++ b/src/corelib/Qt6CTestMacros.cmake @@ -64,6 +64,7 @@ function(_qt_internal_get_cmake_test_configure_options out_var) endif() list(APPEND option_list "-DCMAKE_MESSAGE_LOG_LEVEL=DEBUG") + list(APPEND option_list "-DCMAKE_AUTOGEN_VERBOSE=TRUE") if(APPLE AND CMAKE_OSX_ARCHITECTURES) list(LENGTH CMAKE_OSX_ARCHITECTURES osx_arch_count)