diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-06-13 09:53:19 +0200 |
|---|---|---|
| committer | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2018-06-20 09:14:33 +0000 |
| commit | e9d5fa0ae4b9e2043dd3054797f7a766ecbeae1d (patch) | |
| tree | ccf85bbe10782e42b82ad62a0d1c0390d09880ef | |
| parent | f08a50d9d7b8ddec27fdd9f070fb7e54108570e4 (diff) | |
Enable CMake support
This includes the necessary test needed for this to be working
Change-Id: Ia05d66c36dce5233720dc1670c08942cdc099c52
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| -rw-r--r-- | src/opcua/opcua.pro | 1 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 6 |
3 files changed, 19 insertions, 1 deletions
diff --git a/src/opcua/opcua.pro b/src/opcua/opcua.pro index 073e7b7..abccb71 100644 --- a/src/opcua/opcua.pro +++ b/src/opcua/opcua.pro @@ -11,7 +11,6 @@ load(qt_module) PUBLIC_HEADERS += qopcuaglobal.h -CONFIG -= create_cmake DEFINES += QT_NO_FOREACH HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 0000000..69642bb --- /dev/null +++ b/tests/auto/cmake/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +find_package(Qt5Core REQUIRED) + +include("${_Qt5CTestMacros}") + +test_module_includes( + OpcUa QOpcUaProvider +) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro new file mode 100644 index 0000000..fb32aa0 --- /dev/null +++ b/tests/auto/cmake/cmake.pro @@ -0,0 +1,6 @@ +# Cause make to do nothing. +TEMPLATE = subdirs + +CMAKE_QT_MODULES_UNDER_TEST = opcua + +CONFIG += ctest_testcase |