From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1236912-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 199081382C5
for <garchives@archives.gentoo.org>; Sat, 2 Jan 2021 21:09:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4E512E083B;
Sat, 2 Jan 2021 21:09:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A6578E083E
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Jan 2021 21:08:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 73DEB340F5D
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Jan 2021 21:08:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D452248A
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Jan 2021 21:08:56 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1609621733.b303773638d9da63596101266686762a5c6712d4.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
X-VCS-Directories: dev-cpp/nlohmann_json/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: b303773638d9da63596101266686762a5c6712d4
X-VCS-Branch: master
Date: Sat, 2 Jan 2021 21:08:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9ea0a1a3-9bd8-4a9e-a867-85bd57fd01cd
X-Archives-Hash: 41206cf92e461f945eab0fc9aa725abf
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
}