From 48fa7f53cc36cf660a9c9a504239eaa99939756b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 12 Aug 2021 11:17:58 +0200 Subject: [PATCH] CMake: Save QT_BUILD_BENCHMARKS and other info in BuildInternalsExtra So that those values are used when configuring other repos in a per-repo build arrangement. Pick-to: 6.2 Change-Id: I5ff86260116c52afc87d7fcd5cbd047fcb9dde22 Reviewed-by: Mitch Curtis Reviewed-by: Joerg Bornemann --- cmake/QtBuildInternalsExtra.cmake.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in index 640fbdca9d0..91161b00c81 100644 --- a/cmake/QtBuildInternalsExtra.cmake.in +++ b/cmake/QtBuildInternalsExtra.cmake.in @@ -57,10 +57,17 @@ set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH # Propagate decision of building tests and examples to other repositories. set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.") set(QT_BUILD_EXAMPLES @QT_BUILD_EXAMPLES@ CACHE BOOL "Build Qt examples") +set(QT_BUILD_BENCHMARKS @QT_BUILD_BENCHMARKS@ CACHE BOOL "Build Qt Benchmarks") +set(QT_BUILD_MANUAL_TESTS @QT_BUILD_MANUAL_TESTS@ CACHE BOOL "Build Qt manual tests") +set(QT_BUILD_MINIMAL_STATIC_TESTS @QT_BUILD_MINIMAL_STATIC_TESTS@ CACHE BOOL + "Build minimal subset of tests for static Qt builds") + set(QT_BUILD_TESTS_BY_DEFAULT @QT_BUILD_TESTS_BY_DEFAULT@ CACHE BOOL "Should tests be built as part of the default 'all' target.") set(QT_BUILD_EXAMPLES_BY_DEFAULT @QT_BUILD_EXAMPLES_BY_DEFAULT@ CACHE BOOL "Should examples be built as part of the default 'all' target.") +set(QT_BUILD_TOOLS_BY_DEFAULT @QT_BUILD_TOOLS_BY_DEFAULT@ CACHE BOOL + "Should tools be built as part of the default 'all' target.") # Propagate usage of ccache. set(QT_USE_CCACHE @QT_USE_CCACHE@ CACHE BOOL "Enable the use of ccache")