diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-04 12:43:54 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2021-08-23 17:47:49 +0200 |
| commit | 55d390ac0df48721b1ec974b37eb862faff80170 (patch) | |
| tree | fed6edfa554f7386f90fa1243e59dd3b51490f44 /tests/auto/render/CMakeLists.txt | |
| parent | f3c1ed26d617d854cfa363d412798deb413f73c6 (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/auto/render/CMakeLists.txt')
| -rw-r--r-- | tests/auto/render/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/render/CMakeLists.txt b/tests/auto/render/CMakeLists.txt index 7be090092..3a1075139 100644 --- a/tests/auto/render/CMakeLists.txt +++ b/tests/auto/render/CMakeLists.txt @@ -29,7 +29,10 @@ if(QT_FEATURE_private_tests) add_subdirectory(objectpicker) add_subdirectory(parameter) add_subdirectory(proximityfilter) - add_subdirectory(proximityfiltering) + # TO DO: Investigate why this fails on MinGW + if (NOT MINGW) + add_subdirectory(proximityfiltering) + endif() add_subdirectory(qabstractlight) add_subdirectory(qabstracttexture) add_subdirectory(qabstracttextureimage) @@ -127,7 +130,10 @@ if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_extras AND QT_FEATURE_qt3d_openg endif() if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_extras AND QT_FEATURE_qt3d_opengl_renderer AND TARGET Qt::Quick) add_subdirectory(boundingsphere) - add_subdirectory(pickboundingvolumejob) + # TO DO: Investigate why this fails on MinGW + if (NOT MINGW) + add_subdirectory(pickboundingvolumejob) + endif() add_subdirectory(updateshaderdatatransformjob) endif() if(QT_FEATURE_private_tests AND QT_FEATURE_qt3d_input AND QT_FEATURE_qt3d_opengl_renderer AND TARGET Qt::Quick) |