summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2024-01-10 14:44:44 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2024-01-24 14:16:47 +0100
commit6a4b1669c76625f58e85cc047ea1e37737558c1a (patch)
treecd33456aaec398c0f82fe45ea111f89dee8f4e8b
parente27369baa97c104aa85a6f6aefa79028743142dc (diff)
Enable CMake autotests
Task-number: QTBUG-84884 Change-Id: I3d697f371062ee8d358dce96cec22a9d1c182444 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--tests/auto/CMakeLists.txt2
-rw-r--r--tests/auto/cmake/CMakeLists.txt9
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 03c4e86..60e4b70 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause
if(WIN32 OR (LINUX AND NOT CMAKE_CROSSCOMPILING))
-# add_subdirectory(cmake)
+ add_subdirectory(cmake)
add_subdirectory(conformance)
add_subdirectory(qmqttconnectionproperties)
add_subdirectory(qmqttcontrolpacket)
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index dacfd15..91d1768 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -1,17 +1,16 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-
cmake_minimum_required(VERSION 3.16)
-project(qmake_cmake_files)
+project(qtmqtt_cmake_tests)
enable_testing()
-find_package(Qt5Core REQUIRED)
+find_package(Qt6Core REQUIRED)
-include("${_Qt5CTestMacros}")
+include("${_Qt6CTestMacros}")
-test_module_includes(
+_qt_internal_test_module_includes(
Mqtt QMqttClient
)