summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2024-01-12 17:18:22 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2024-01-25 09:01:57 +0100
commit68244963e4649580aae9ce7405bda75e8f98888a (patch)
treeb738a654c70b4adc01cefe5c1bfc433e97213985
parent6ecc9b22b14c240a3977e371e5a07c2504d550c8 (diff)
Add CMake autotest
Task-number: QTBUG-84884 Change-Id: I21d27b35108c9d7aa1941e4fbc5850455b2099e2 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--tests/auto/CMakeLists.txt1
-rw-r--r--tests/auto/cmake/CMakeLists.txt8
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index f2d02d4a1..79dfe6bf6 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -7,6 +7,7 @@ if(NOT QT_FEATURE_qt3d_extras)
return()
endif()
+add_subdirectory(cmake)
add_subdirectory(core)
add_subdirectory(global)
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index bac661619..070bc4ed2 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -4,18 +4,18 @@
cmake_minimum_required(VERSION 3.16)
-project(qmake_cmake_files)
+project(qt3d_cmake_tests)
enable_testing()
-find_package(Qt5Core REQUIRED)
+find_package(Qt6Core REQUIRED)
-include("${_Qt5CTestMacros}")
+include("${_Qt6CTestMacros}")
set(QAspectEngine_NAMESPACE Qt3DCore)
set(QMesh_NAMESPACE Qt3DRender)
-test_module_includes(
+_qt_internal_test_module_includes(
3DCore QAspectEngine
3DRender QMesh
)