diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 20 |
2 files changed, 13 insertions, 14 deletions
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000000..221413713e --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ae0aa141f4..d1a395c9f3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,21 +1,13 @@ -# special case begin -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.14.0) - project(QtBaseTests VERSION 6.0.0 LANGUAGES C CXX ASM) - find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test) - find_package(Qt6 COMPONENTS DBus Gui OpenGL Widgets Xml - AccessibilitySupport LinuxAccessibilitySupport - WindowsUIAutomationSupport - ) - qt_set_up_standalone_tests_build() +# Generated from tests.pro. - # Find a few packages that are usually found in configure.cmake, - # because a few tests link directly against those libraries. +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. + # special case begin qt_find_package(WrapDBus1 PROVIDED_TARGETS dbus-1) qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data) qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::OpenSSL) + # special case end endif() -# special case end - qt_build_tests() |