nlohmann-json: Add symlink to json.hpp and update to 3.3.0

PATCH New James Feist 1 participant 1 message Oct 11, 2018

Share & tools

James Feist

author

2018-10-11 20:48 UTC #0 lore raw

PATCH v2 1/1 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 <[email protected]>

---
changes:
- fixed srcrev

 .../nlohmann-json/nlohmann-json_git.bb                 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +8 -2

index a89b659ae..65e49bc95 100644
@@ -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
+}

Signature · 1 line

2.17.1