From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
Date: Tue, 29 Mar 2022 10:51:13 +0000 (UTC) [thread overview]
Message-ID: <1648550849.5f2b69f3ffb3011e3c77506e98d6363379274ac6.asturm@gentoo> (raw)
commit: 5f2b69f3ffb3011e3c77506e98d6363379274ac6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 10:47:29 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 10:47:29 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f2b69f3
kde-frameworks/extra-cmake-modules: Rebase skip-ecm_add_test-early.patch
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/836348
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 2 +-
...e-modules-5.93.0-skip-ecm_add_test-early.patch} | 39 ++++++++++++----------
2 files changed, 22 insertions(+), 19 deletions(-)
--git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
index df4d73770a..d692244ad8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
+ "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
"${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
)
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
similarity index 61%
rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
index 72541d73e7..f9eef60072 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -1,35 +1,36 @@
-From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001
+From 9b53dd107af153b88658ffa246de728a8a6fbd9d 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 Qt5::Test is not available
+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 | 9 +++++++++
- tests/ECMAddTests/CMakeLists.txt | 5 +++++
- 2 files changed, 14 insertions(+)
+ tests/ECMAddTests/CMakeLists.txt | 4 ++++
+ 2 files changed, 13 insertions(+)
diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
-index 4bc7fb8..12825aa 100644
+index 58c78d05..994ed1e4 100644
--- a/modules/ECMAddTests.cmake
+++ b/modules/ECMAddTests.cmake
-@@ -81,6 +81,10 @@ function(ecm_add_test)
+@@ -84,6 +84,10 @@ function(ecm_add_test)
message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
endif()
-+ if(NOT TARGET Qt5::Test)
++ if(NOT TARGET Qt::Test)
+ return()
+ endif()
+
set(_testname ${ARG_NAME_PREFIX}${_targetname})
set(gui_args)
if(ARG_GUI)
-@@ -122,6 +126,11 @@ function(ecm_add_tests)
+@@ -127,6 +131,11 @@ function(ecm_add_tests)
endif()
set(test_names)
set(target_names)
+
-+ if(NOT TARGET Qt5::Test)
++ if(NOT TARGET Qt::Test)
+ return()
+ endif()
+
@@ -37,18 +38,20 @@ index 4bc7fb8..12825aa 100644
ecm_add_test(${_test_source}
NAME_PREFIX ${ARG_NAME_PREFIX}
diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
-index e77b33f..4e191fe 100644
+index aa7e73a1..5fbc1cc7 100644
--- a/tests/ECMAddTests/CMakeLists.txt
+++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+if(NOT TARGET Qt5::Test)
-+ message(STATUS "WARNING: skipping tests that require Qt5::Test")
-+ return()
-+endif()
+@@ -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)
- string(REPLACE "." "/" dir "${NAME}")
- string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
--
-2.27.0
+2.35.1
next reply other threads:[~2022-03-29 10:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 10:51 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-19 20:29 [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/ Andreas Sturmlechner
2021-12-29 19:16 Andreas Sturmlechner
2021-10-05 15:49 Andreas Sturmlechner
2020-08-30 19:02 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2019-12-09 14:50 Andreas Sturmlechner
2018-01-07 19:15 Andreas Sturmlechner
2017-08-08 7:17 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1648550849.5f2b69f3ffb3011e3c77506e98d6363379274ac6.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox