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: Sat, 02 Jan 2021 21:09:01
Message-Id: 1609621733.b303773638d9da63596101266686762a5c6712d4.sam@gentoo
1 commit: b303773638d9da63596101266686762a5c6712d4
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 2 21:08:48 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 2 21:08:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3037736
7
8 dev-cpp/nlohmann_json: (really) build tests conditionally
9
10 Closes: https://bugs.gentoo.org/763177
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 6 ++++--
15 1 file changed, 4 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 cbad769efb0..dda1074ac3b 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 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2020 Gentoo Authors
23 +# Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=7
27 @@ -25,18 +25,20 @@ DEPEND="doc? ( app-doc/doxygen )"
28 DOCS=( ChangeLog.md README.md )
29
30 src_configure() {
31 + # Tests are built by default so we can't group the test logic below
32 local mycmakeargs=(
33 -DJSON_MultipleHeaders=ON
34 + -DJSON_BuildTests=$(usex test)
35 )
36
37 if use test ; then
38 # Define test data directory here to avoid unused var QA warning
39 # #747826
40 mycmakeargs+=(
41 - -DJSON_BuildTests=ON
42 -DJSON_TestDataDirectory="${S}/json_test_data"
43 )
44 fi
45 +
46 cmake_src_configure
47 }