public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
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: Sun, 11 Oct 2020 20:31:54 +0000 (UTC)	[thread overview]
Message-ID: <1602448309.462bee716e348083ab3d99e8b11266bf14b8880b.sam@gentoo> (raw)

commit:     462bee716e348083ab3d99e8b11266bf14b8880b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 20:20:29 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:31:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462bee71

dev-cpp/nlohmann_json: conditionally pass test data dir

Closes: https://bugs.gentoo.org/747826
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 ++++++++--
 1 file changed, 8 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 8c50916e83e..691afb13f9c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -26,11 +26,17 @@ DOCS=( ChangeLog.md README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		-DJSON_BuildTests=$(usex test)
-		-DJSON_TestDataDirectory="${S}/json_test_data"
 		-DJSON_MultipleHeaders=ON
 	)
 
+	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
 }
 


             reply	other threads:[~2020-10-11 20:31 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-11 20:31 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
2021-01-02 21:08 Sam James
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-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=1602448309.462bee716e348083ab3d99e8b11266bf14b8880b.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