commit: 0092b88c75322b6df831c0b2db03b72adc72ff01
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 7 15:21:35 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 7 18:05:40 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0092b88c
kde-frameworks/extra-cmake-modules: Rebase skip-ecm_add_test-early.patch
Upstream commit 4b1ff86cba5dfe6fe1b163bf5cfa726a2f092a57
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../extra-cmake-modules-9999.ebuild | 2 +-
...ke-modules-6.22.0-skip-ecm_add_test-early.patch | 58 ++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletion(-)
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 cb3538b892..06517a9cb3 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 0000000000..662e34f234
--- /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 <[email protected]>
+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 <[email protected]>
+---
+ 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
+
