summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-03-23 16:24:16 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2022-03-24 21:50:50 +0100
commit70c3dd4a54d3b72076bfc2edbd66fd5ccf0e3b28 (patch)
tree56e2ebe7109c8c2c5d1b0cf0fa79ce2e53ee8e3a
parent64d5708458d611fe6f96c0f9ad4b9ec457e807cd (diff)
CMake: Enable verbose autogen for cmake auto tests and EP examples
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 <joerg.bornemann@qt.io>
-rw-r--r--cmake/QtBuildInternals/QtBuildInternalsConfig.cmake1
-rw-r--r--src/corelib/Qt6CTestMacros.cmake1
2 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 279abdb8a0..5dcfdbe0cb 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 e7eaa3c26b..05130a1555 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)