summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2014-10-28 13:39:32 +0100
committerMarcel Krems <m.krems@software-vision.eu>2014-10-28 14:31:38 +0100
commit94498ef06d3aacdc5129cae3c06d9e48b30614f0 (patch)
treef8b571fe82d6871298285a0f60aa5cbc650da894
parent36f370ac28c5864da5bc1cbd61980e053c1cb4c9 (diff)
Add CMake tests.HEADmaster
Task-number: QTBUG-41445 Change-Id: I8fb0eca0f38d38d8bdd6540c2c66cc4c62523848 Reviewed-by: Stephen Kelly <steveire@gmail.com>
-rw-r--r--tests/auto/auto.pro1
-rw-r--r--tests/auto/cmake/CMakeLists.txt14
-rw-r--r--tests/auto/cmake/cmake.pro7
3 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 60b4806..6a4959d 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,3 +2,4 @@ TEMPLATE = subdirs
SUBDIRS += headersclean
SUBDIRS += qhttp
+SUBDIRS += cmake
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 0000000..50bd840
--- /dev/null
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+project(qmake_cmake_files)
+
+enable_testing()
+
+find_package(Qt5Core REQUIRED)
+
+include("${_Qt5CTestMacros}")
+
+test_module_includes(
+ Http QHttp
+)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 0000000..a3bdafd
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,7 @@
+
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = http
+
+CONFIG += ctest_testcase