From 55d390ac0df48721b1ec974b37eb862faff80170 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 4 Aug 2021 12:43:54 +0200 Subject: CMake: Ensure standalone tests are built When Qt's CI configures standalone tests with qt-internal-configure-tests the value of QT_FEATURE_qt3d_extra is not available before actually calling qt_build_tests. Move the check into each test subdirectory. Although it's likely the check was too coarse-grained in the first place and should be changed into something more specific that doesn't exclude tests that shouldn't be excluded. Pick-to: 6.2 Change-Id: Ic267b3a9c7f078c60699b709591a3d0ae8bb3018 Reviewed-by: Qt CI Bot Reviewed-by: Mike Krus Reviewed-by: Alexandru Croitor --- tests/manual/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/manual') diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 9bcebe6e9..71e4587f0 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,5 +1,9 @@ # Generated from manual.pro. +if(NOT QT_FEATURE_qt3d_extras) + return() +endif() + add_subdirectory(bigscene-cpp) add_subdirectory(component-changes) add_subdirectory(custom-mesh-cpp) -- cgit v1.2.3