diff options
| author |   Sam James <sam@gentoo.org> | 2020-10-11 19:32:52 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-10-11 19:36:02 +0000 |
| commit | 7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0 (patch) | |
| tree | f20d80d7b5840bc6d311e0163c1cada91afdacbe /dev-cpp | |
| parent | profiles/package.mask: adjust Wireshark mask message (diff) | |
| download | gentoo-7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0.tar.gz gentoo-7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0.tar.bz2 gentoo-7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0.zip | |
Revert "profiles/package.mask: adjust Wireshark mask message"
Accidentally included an unrelated staged fix.
This reverts commit 7f330da7d87d963fe68d78b858dbe0be8a2fc252.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 |
1 files changed, 2 insertions, 8 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 691afb13f9c1..8c50916e83e9 100644 --- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild @@ -26,17 +26,11 @@ 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 } |