From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 794B8138359 for ; Sun, 11 Oct 2020 20:31:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB3D0E0C31; Sun, 11 Oct 2020 20:31:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A0FE9E0C31 for ; Sun, 11 Oct 2020 20:31:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 56344340C35 for ; Sun, 11 Oct 2020 20:31:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCF5A36B for ; Sun, 11 Oct 2020 20:31:54 +0000 (UTC) From: "Sam James" 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" Message-ID: <1602448309.462bee716e348083ab3d99e8b11266bf14b8880b.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: 462bee716e348083ab3d99e8b11266bf14b8880b X-VCS-Branch: master Date: Sun, 11 Oct 2020 20:31:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46f55a03-d314-4697-aef1-03a3cf1aba11 X-Archives-Hash: b4d20583d8053039d35e0580ac2906fa commit: 462bee716e348083ab3d99e8b11266bf14b8880b Author: Sam James gentoo org> AuthorDate: Sun Oct 11 20:20:29 2020 +0000 Commit: Sam James gentoo 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 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 }