From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
Date: Sat, 2 Jan 2021 21:08:56 +0000 (UTC) [thread overview]
Message-ID: <1609621733.b303773638d9da63596101266686762a5c6712d4.sam@gentoo> (raw)
commit: b303773638d9da63596101266686762a5c6712d4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 21:08:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 2 21:08:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3037736
dev-cpp/nlohmann_json: (really) build tests conditionally
Closes: https://bugs.gentoo.org/763177
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index cbad769efb0..dda1074ac3b 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,18 +25,20 @@ DEPEND="doc? ( app-doc/doxygen )"
DOCS=( ChangeLog.md README.md )
src_configure() {
+ # Tests are built by default so we can't group the test logic below
local mycmakeargs=(
-DJSON_MultipleHeaders=ON
+ -DJSON_BuildTests=$(usex test)
)
if use test ; then
# Define test data directory here to avoid unused var QA warning
# #747826
mycmakeargs+=(
- -DJSON_BuildTests=ON
-DJSON_TestDataDirectory="${S}/json_test_data"
)
fi
+
cmake_src_configure
}
next reply other threads:[~2021-01-02 21:09 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 21:08 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-23 17:21 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/ Michał Górny
2024-11-23 12:28 Arthur Zamarin
2024-11-23 12:09 Sam James
2024-11-23 12:09 Sam James
2024-11-23 12:09 Sam James
2023-11-30 3:07 Sam James
2023-10-18 14:09 Sam James
2023-08-30 5:16 Sam James
2023-03-24 14:07 Arthur Zamarin
2023-03-22 5:44 Sam James
2023-02-16 5:52 WANG Xuerui
2022-12-18 12:16 Sam James
2022-08-13 17:43 Sam James
2022-08-13 13:32 Sam James
2022-08-12 21:02 Sam James
2022-06-07 8:24 Jakov Smolić
2022-04-17 19:24 Sam James
2022-02-19 15:22 Arthur Zamarin
2022-02-19 13:22 Jakov Smolić
2022-02-19 13:15 Jakov Smolić
2022-02-19 9:05 Arthur Zamarin
2022-01-11 4:33 Sam James
2022-01-09 9:17 Sam James
2021-10-17 0:03 Georgy Yakovlev
2021-10-09 4:21 Sam James
2021-09-25 18:11 Sam James
2021-09-02 13:27 Marek Szuba
2021-08-18 3:45 Sam James
2021-08-18 3:45 Sam James
2021-03-15 6:38 Sam James
2021-01-02 21:31 David Seifert
2020-12-16 21:34 Sam James
2020-12-11 23:10 Sergei Trofimovich
2020-12-11 23:07 Sergei Trofimovich
2020-12-10 21:41 Thomas Deutschmann
2020-10-11 20:31 Sam James
2020-10-10 6:31 Sam James
2020-10-07 7:09 Agostino Sarubbo
2020-10-07 6:53 Agostino Sarubbo
2020-10-07 6:50 Agostino Sarubbo
2020-10-07 6:42 Agostino Sarubbo
2020-10-04 0:26 Sam James
2020-01-16 15:45 Tim Harder
2019-09-27 5:49 Tim Harder
2019-09-27 5:49 Tim Harder
2019-09-26 6:52 Sergei Trofimovich
2019-07-23 8:23 Agostino Sarubbo
2019-07-21 8:25 Sergei Trofimovich
2019-07-18 14:32 Thomas Deutschmann
2019-06-28 23:26 Tim Harder
2019-04-11 5:37 Tim Harder
2019-02-17 17:40 Sergei Trofimovich
2018-12-29 21:04 Tim Harder
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=1609621733.b303773638d9da63596101266686762a5c6712d4.sam@gentoo \
--to=sam@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