diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-01-10 16:34:06 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-01-24 14:15:12 +0100 |
| commit | d25651e2ac140d898460dd62200acbf307a11b21 (patch) | |
| tree | 73fff72d47ada2c20cffc37c8501cdfd47d0ab6d | |
| parent | 843b18a3bf4cb623fb159e1fd26721fba7d8ec86 (diff) | |
Enable CMake autotest
Task-number: QTBUG-84884
Change-Id: I2cf02ed37c4afc2ef8bb379375b6c7361e63a7ae
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | tests/auto/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index c5c9961..621922b 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause +add_subdirectory(cmake) + # For now, don't built auto tests when QT_BUILD_MINIMAL_STATIC_TEST # is specified and the build is targeting iOS. QT_BUILD_MINIMAL_STATIC_TEST is used in our CI. # Regular non-cmake build tests shouldn't be built because the CI will try to run them and fail @@ -16,8 +18,6 @@ if(TARGET Qt::Widgets) endif() add_subdirectory(qsvgplugin) add_subdirectory(qicon_svg) - # add_subdirectory(cmake) # special case remove - # add_subdirectory(installed_cmake) # special case remove endif() if(TARGET Qt::Widgets AND NOT ANDROID) add_subdirectory(qsvgrenderer) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index e73583b..f86573f 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,17 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause - cmake_minimum_required(VERSION 3.16) - -project(qmake_cmake_files) +project(qtsvg_cmake_tests) enable_testing() -find_package(Qt5Core REQUIRED) +find_package(Qt6Core REQUIRED) -include("${_Qt5CTestMacros}") +include("${_Qt6CTestMacros}") -test_module_includes( +_qt_internal_test_module_includes( Svg QSvgRenderer ) |