summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-08-04 12:43:54 +0200
committerPaul Lemire <paul.lemire@kdab.com>2021-08-23 17:47:49 +0200
commit55d390ac0df48721b1ec974b37eb862faff80170 (patch)
treefed6edfa554f7386f90fa1243e59dd3b51490f44 /tests/manual
parentf3c1ed26d617d854cfa363d412798deb413f73c6 (diff)
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 <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
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)