From 110652d95152272df5649c6dd6c0fc98a47129df Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Dec 2019 18:37:09 -0800 Subject: nlohmann-json: Upgrade to 3.7.3 Rename recipe to express PV Signed-off-by: Khem Raj --- .../nlohmann-json/nlohmann-json_3.7.3.bb | 27 ++++++++++++++++++++ .../nlohmann-json/nlohmann-json_git.bb | 29 ---------------------- 2 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb delete mode 100644 meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb (limited to 'meta-oe/recipes-devtools/nlohmann-json') diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb new file mode 100644 index 0000000000..86fe673b47 --- /dev/null +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "JSON for modern C++" +HOMEPAGE = "https://nlohmann.github.io/json/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" + +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1" + +SRCREV = "e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4" + +S = "${WORKDIR}/git" + +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" + +# other packages commonly reference the file directly as "json.hpp" +# create symlink to allow this usage +do_install_append() { + ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp +} diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb deleted file mode 100644 index 4399edaab1..0000000000 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "JSON for modern C++" -HOMEPAGE = "https://nlohmann.github.io/json/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" - -SRC_URI = "git://github.com/nlohmann/json.git" - -PV = "3.7.0+git${SRCPV}" - -SRCREV = "ea60d40f4a60a47d3be9560d8f7bc37c163fe47b" - -S = "${WORKDIR}/git" - -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" - -# other packages commonly reference the file directly as "json.hpp" -# create symlink to allow this usage -do_install_append() { - ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp -} -- cgit v1.2.3-54-g00ecf