diff options
| author | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-29 10:19:06 +0200 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-30 10:11:01 +0200 |
| commit | 25ef6a257d393b28cf5f4fd00569c7683e733378 (patch) | |
| tree | ea04a79ebc51322cda94d088701fbe500930f5b4 | |
| parent | 2e341eff31afe36a87e1ff41680b6fbac39eb35d (diff) | |
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>
| -rw-r--r-- | src/charts/charts.pro | 1 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 7 |
4 files changed, 23 insertions, 2 deletions
diff --git a/src/charts/charts.pro b/src/charts/charts.pro index c615e1ef..09835cb6 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 32d49fa4..b9da92b8 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 00000000..7f772845 --- /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 00000000..e50c687d --- /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 |