From 25ef6a257d393b28cf5f4fd00569c7683e733378 2014-10-30 08:11:01
From: Titta Heikkala <titta.heikkala@theqtcompany.com>
Date: 2014-10-30 08:11:01
Subject: [PATCH] Add cmake support

Auto test required for cmake are added to Charts.

Change-Id: I00f63502214e086c15e49b168160323f5f40fbd0
Task-number: QTRD-2874
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

---

diff --git a/src/charts/charts.pro b/src/charts/charts.pro
index c615e1e..09835cb 100644
--- a/src/charts/charts.pro
+++ b/src/charts/charts.pro
@@ -13,7 +13,6 @@ MODULE_INCNAME = QtCharts
 QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf
 
 load(qt_module)
-CONFIG -= create_cmake
 
 ############################# SOURCES ##########################################
 
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 32d49fa..b9da92b 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -22,7 +22,8 @@ SUBDIRS += \
            qbarcategoryaxis \
            domain \
            chartdataset \
-           qlegend
+           qlegend \
+           cmake
 
 !linux-arm*: {
     SUBDIRS += \
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 0000000..7f77284
--- /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(
+  Charts QChartView
+)
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 0000000..e50c687
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,7 @@
+
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = charts
+
+CONFIG += ctest_testcase