From 69e5fa1485aa58ad1d664070b0d9e4db413fdd62 Mon Sep 17 00:00:00 2001 From: James Feist Date: Thu, 11 Oct 2018 13:47:04 -0700 Subject: nlohmann-json: Add symlink to json.hpp and update to 3.3.0 nlohmann-json has examples in their repo that refer to the header as json.hpp directly, as such many packages that require nlohmann-json expect json.hpp and not nlohmann/json.hpp as the cmake file installs. Create symlink so that access is available by either option. Also update to release 3.3.0. Signed-off-by: James Feist Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-devtools/nlohmann-json') diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb index a89b659ae8..65e49bc95b 100644 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=9a8ae1c2d606c432a2aa2e2de15be22a" SRC_URI = "git://github.com/nlohmann/json.git" -PV = "3.2.0+git${SRCPV}" +PV = "3.3.0+git${SRCPV}" -SRCREV = "8c20571136f2d5351b379a06ad6591bd980880fe" +SRCREV = "aafad2be1f3cd259a1e79d2f6fcf267d1ede9ec7" S = "${WORKDIR}/git" @@ -21,3 +21,9 @@ EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" 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 1.2.3-korg