aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2024-01-10 12:56:53 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2024-01-25 09:30:55 +0100
commit60ac2d0628687a369d3d6d716b16d2a0029c6526 (patch)
treee0d5e96c11e21575c35c20122f3a7897d59fee6e
parent50db096a26d7c72a892befe11aec84f9453f2351 (diff)
Enable CMake autotests
Task-number: QTBUG-84884 Change-Id: I653746159c57d78db45a1a0b8a059ffed355fa4b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
-rw-r--r--tests/auto/CMakeLists.txt3
-rw-r--r--tests/auto/cmake/CMakeLists.txt8
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 4a35aa2..bb604d9 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,6 +1,9 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
+if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "QNX") # QTBUG-121487
+ add_subdirectory(cmake)
+endif()
add_subdirectory(qcoapclient)
add_subdirectory(qcoapmessage)
add_subdirectory(qcoapoption)
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index b130e27..a2c38db 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -3,14 +3,14 @@
cmake_minimum_required(VERSION 3.16)
-project(qmake_cmake_files)
+project(qtcoap_cmake_tests)
enable_testing()
-find_package(Qt5Core REQUIRED)
+find_package(Qt6Core REQUIRED)
-include("${_Qt5CTestMacros}")
+include("${_Qt6CTestMacros}")
-test_module_includes(
+_qt_internal_test_module_includes(
Coap QCoapClient
)