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
 }
 

Reply via email to