From c628533c2a2a68a78c46a0d861fd5772569b65e2 Mon Sep 17 00:00:00 2001 From: James Feist Date: Thu, 4 Oct 2018 15:43:54 -0700 Subject: meta-phosphor: Update nlohmann-json Update to latest release and fixup recipe to use cmake. Copy styling from rapidjson in meta-oe as these have basically the same purpose. Tested-by: Verified image still built (From meta-phosphor rev: 9a6e2eebe418cfb5608f477caa327864e4037fdc) Change-Id: Iceb244a43e7a24dbdd5e2f9d4c5470796cb85d0b Signed-off-by: James Feist Signed-off-by: Brad Bishop --- .../nlohmann-json/nlohmann-json_git.bb | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'meta-phosphor/recipes-support') diff --git a/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb b/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb index bbb63a1bf..a89b659ae 100644 --- a/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb +++ b/meta-phosphor/recipes-support/nlohmann-json/nlohmann-json_git.bb @@ -1,18 +1,23 @@ -DESCRIPTION = "JSON for modern C++" +SUMMARY = "JSON for modern C++" HOMEPAGE = "https://nlohmann.github.io/json/" +SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=9a8ae1c2d606c432a2aa2e2de15be22a" SRC_URI = "git://github.com/nlohmann/json.git" -ALLOW_EMPTY_${PN} = "1" +PV = "3.2.0+git${SRCPV}" -PV = "3.1.2+git${SRCPV}" - -SRCREV = "183390c10b8ba4aa33934ae593f82f352befefc8" +SRCREV = "8c20571136f2d5351b379a06ad6591bd980880fe" S = "${WORKDIR}/git" -do_install_append(){ - install -d ${D}${includedir}/nlohmann - install -m 644 ${S}/single_include/nlohmann/json.hpp ${D}${includedir}/nlohmann/json.hpp -} + +inherit cmake + +EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" + +# nlohmann-json is a header only C++ library, so the main package will be empty. + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.1