summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-06-09 08:40:41 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-06-10 13:57:31 +0000
commit09a701b0aecd199a210df971fb0f13bd37c24430 (patch)
tree35465cf3acf28ed8ba1ad3dac7197ee2e3d20fb6
parent0eec20fc1e5ee4822bd8560eb6c3c551879528ea (diff)
Fix cmake unit test for Qt3D
Task-number: QTBUG-46592 Change-Id: Ib28a8fcf2c0e692dd10227f9a9e3c6a10a7fcdbd Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-rw-r--r--tests/auto/auto.pro5
-rw-r--r--tests/auto/cmake/CMakeLists.txt7
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 43811f84e..8326d90b6 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -3,4 +3,7 @@ TEMPLATE = subdirs
SUBDIRS = \
core \
render \
- quick3d
+ quick3d \
+ cmake
+
+installed_cmake.depends = cmake
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index dfd0cba9a..b68e55708 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -9,7 +9,10 @@ find_package(Qt5Core REQUIRED)
include("${_Qt5CTestMacros}")
+set(QAspectEngine_NAMESPACE Qt3D)
+set(QMesh_NAMESPACE Qt3D)
+
test_module_includes(
- 3dcore QAspectEngine
- 3drenderer Mesh
+ 3DCore QAspectEngine
+ 3DRenderer QMesh
)