diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2025-12-07 16:21:35 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2025-12-07 19:05:40 +0100 |
| commit | 0092b88c75322b6df831c0b2db03b72adc72ff01 (patch) | |
| tree | dbd8f89d83e3e369c702de210cb76e776a84e6a2 | |
| parent | 8a428c615005e493fc4f810e64bf20edfd6a1a2e (diff) | |
| download | kde-0092b88c75322b6df831c0b2db03b72adc72ff01.tar.gz kde-0092b88c75322b6df831c0b2db03b72adc72ff01.tar.bz2 kde-0092b88c75322b6df831c0b2db03b72adc72ff01.zip | |
kde-frameworks/extra-cmake-modules: Rebase skip-ecm_add_test-early.patch
Upstream commit 4b1ff86cba5dfe6fe1b163bf5cfa726a2f092a57
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.22.0-skip-ecm_add_test-early.patch | 58 |
2 files changed, 59 insertions, 1 deletions
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index cb3538b8921..06517a9cb35 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -38,7 +38,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" + "${FILESDIR}/${PN}-6.22.0-skip-ecm_add_test-early.patch" "${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch" "${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch" "${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.patch" diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.22.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.22.0-skip-ecm_add_test-early.patch new file mode 100644 index 00000000000..662e34f234c --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.22.0-skip-ecm_add_test-early.patch @@ -0,0 +1,58 @@ +From 0454112942d8a4636c848cc92bde7b91ca3e369e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 11 Jul 2020 23:04:16 +0200 +Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not + available + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + modules/ECMAddTests.cmake | 10 ++++++++++ + tests/ECMAddTests/CMakeLists.txt | 4 ++++ + 2 files changed, 14 insertions(+) + +diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake +index ce0586f0..e362d990 100644 +--- a/modules/ECMAddTests.cmake ++++ b/modules/ECMAddTests.cmake +@@ -373,6 +373,11 @@ function(ecm_add_test) + message(FATAL_ERROR "ecm_add_test() called with both \"NO_NAME_PREFIX\" and \"NAME_PREFIX\"") + endif() + endif() ++ ++ if(NOT TARGET Qt::Test) ++ return() ++ endif() ++ + set(_testname ${ARG_NAME_PREFIX}${_targetname}) + set(gui_args) + if(ARG_GUI) +@@ -441,6 +446,11 @@ function(ecm_add_tests) + endif() + set(test_names) + set(target_names) ++ ++ if(NOT TARGET Qt::Test) ++ return() ++ endif() ++ + foreach(_test_source ${ARG_UNPARSED_ARGUMENTS}) + ecm_add_test(${_test_source} + ${_name_prefix} +diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt +index ca82c7e9..78527903 100644 +--- a/tests/ECMAddTests/CMakeLists.txt ++++ b/tests/ECMAddTests/CMakeLists.txt +@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6") + set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON") + else() + set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF") ++ ++if(NOT TARGET Qt::Test) ++ message(STATUS "WARNING: skipping tests that require Qt::Test") ++ return() + endif() + + macro(add_check NAME) +-- +2.52.0 + |