From c3730ffa9228ba43f4b7c7ec518a7a47e981ff2e Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 27 Sep 2022 14:51:09 +0200 Subject: [PATCH] wasm: enable QT_BUILD_MINIMAL_STATIC_TESTS by default Wasm doesn't play well with these baseline tests in general, so we can disable them for now. Pick-to: 6.4 Change-Id: I5a66a932449c8934d88b94e419aae5ddcc89ee78 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot --- cmake/QtSetup.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index eec10bfa427..a523e2cc2c6 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -273,7 +273,13 @@ option(QT_BUILD_EXAMPLES_AS_EXTERNAL "Should examples be built as ExternalProjec unset(_qt_build_examples_as_external) option(QT_BUILD_MANUAL_TESTS "Build Qt manual tests" OFF) -option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" OFF) + +if(WASM) + option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" ON) +else() + option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" OFF) +endif() + option(QT_BUILD_MINIMAL_ANDROID_MULTI_ABI_TESTS "Build minimal subset of tests for Android multi-ABI Qt builds" OFF)