Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
Date: Sun, 11 Oct 2020 20:31:58
Message-Id: 1602448309.462bee716e348083ab3d99e8b11266bf14b8880b.sam@gentoo
1 commit: 462bee716e348083ab3d99e8b11266bf14b8880b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 11 20:20:29 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 20:31:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462bee71
7
8 dev-cpp/nlohmann_json: conditionally pass test data dir
9
10 Closes: https://bugs.gentoo.org/747826
11 Package-Manager: Portage-3.0.8, Repoman-3.0.1
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 ++++++++--
15 1 file changed, 8 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
18 index 8c50916e83e..691afb13f9c 100644
19 --- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
20 +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
21 @@ -26,11 +26,17 @@ DOCS=( ChangeLog.md README.md )
22
23 src_configure() {
24 local mycmakeargs=(
25 - -DJSON_BuildTests=$(usex test)
26 - -DJSON_TestDataDirectory="${S}/json_test_data"
27 -DJSON_MultipleHeaders=ON
28 )
29
30 + if use test ; then
31 + # Define test data directory here to avoid unused var QA warning
32 + # #747826
33 + mycmakeargs+=(
34 + -DJSON_BuildTests=ON
35 + -DJSON_TestDataDirectory="${S}/json_test_data"
36 + )
37 + fi
38 cmake_src_configure
39 }