diff options
Diffstat (limited to 'tests/auto/cmake')
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 16 | ||||
-rw-r--r-- | tests/auto/cmake/cmake.pro | 7 |
2 files changed, 9 insertions, 14 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index a634b9dec..6e556ff93 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,24 +1,26 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause -cmake_minimum_required(VERSION 2.8) - -project(qmake_cmake_files) +cmake_minimum_required(VERSION 3.16) +project(qtmultimedia_cmake_tests) enable_testing() -find_package(Qt5Core REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Core) +find_package(Qt6 OPTIONAL_COMPONENTS Widgets) -include("${_Qt5CTestMacros}") +include("${_Qt6CTestMacros}") set(qt_module_includes Multimedia QCamera ) -if (NOT NO_WIDGETS) +if(TARGET Qt6::Widgets) list(APPEND qt_module_includes MultimediaWidgets QVideoWidget ) endif() -test_module_includes( +_qt_internal_test_module_includes( ${qt_module_includes} ) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index 50a944114..000000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,7 +0,0 @@ - -# Cause make to do nothing. -TEMPLATE = subdirs - -CMAKE_QT_MODULES_UNDER_TEST = multimedia multimediawidgets - -CONFIG += ctest_testcase |