CMake: Enable debug verbosity for cmake auto tests and EP examples

Since e2a0ddbb69640c94b4ee107260a088d5c1c7e273 , if Qt is configured
as a non-developer-build, some of the CMake tests that include QtSetup
would have their CMAKE_MESSAGE_LOG_LEVEL set to the reduced NOTICE
value.
Make sure that tests always have a DEBUG level, so that if they fail
in the CI, we have more info on what goes wrong.

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 a non default log level.

Amends e2a0ddbb69640c94b4ee107260a088d5c1c7e273

Change-Id: Icd3b6e0fcc6c73e4b53b6c4a6d8354c96077a050
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 64d5708458d611fe6f96c0f9ad4b9ec457e807cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2022-03-23 14:43:23 +01:00 committed by Qt Cherry-pick Bot
parent 9d553a2dfb
commit b5619d6831
2 changed files with 5 additions and 0 deletions

View File

@ -1024,6 +1024,9 @@ function(qt_internal_add_example_external_project subdir)
list(APPEND var_defs -D${var_with_type}=${varForGenex})
endforeach()
if(QT_INTERNAL_VERBOSE_EXAMPLES)
list(APPEND var_defs -DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG)
endif()
set(deps "")
list(REMOVE_DUPLICATES QT_EXAMPLE_DEPENDENCIES)

View File

@ -63,6 +63,8 @@ function(_qt_internal_get_cmake_test_configure_options out_var)
list(APPEND option_list "-DNO_DBUS=True")
endif()
list(APPEND option_list "-DCMAKE_MESSAGE_LOG_LEVEL=DEBUG")
if(APPLE AND CMAKE_OSX_ARCHITECTURES)
list(LENGTH CMAKE_OSX_ARCHITECTURES osx_arch_count)