diff options
| author | James Feist <james.feist@linux.intel.com> | 2018-10-11 13:47:04 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-10-11 13:52:06 -0700 |
| commit | 69e5fa1485aa58ad1d664070b0d9e4db413fdd62 (patch) | |
| tree | ef82c44632c22f40bb7f6f94719acd90ef062b4e | |
| parent | e4baf298cd658b37fd90134dc54a92c75fd117d9 (diff) | |
| download | meta-openembedded-69e5fa1485aa58ad1d664070b0d9e4db413fdd62.tar.gz | |
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 <james.feist@linux.intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb | 10 |
1 files changed, 8 insertions, 2 deletions
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" | |||
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/nlohmann/json.git" | 7 | SRC_URI = "git://github.com/nlohmann/json.git" |
| 8 | 8 | ||
| 9 | PV = "3.2.0+git${SRCPV}" | 9 | PV = "3.3.0+git${SRCPV}" |
| 10 | 10 | ||
| 11 | SRCREV = "8c20571136f2d5351b379a06ad6591bd980880fe" | 11 | SRCREV = "aafad2be1f3cd259a1e79d2f6fcf267d1ede9ec7" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 14 | 14 | ||
| @@ -21,3 +21,9 @@ EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" | |||
| 21 | RDEPENDS_${PN}-dev = "" | 21 | RDEPENDS_${PN}-dev = "" |
| 22 | 22 | ||
| 23 | BBCLASSEXTEND = "native nativesdk" | 23 | BBCLASSEXTEND = "native nativesdk" |
| 24 | |||
| 25 | # other packages commonly reference the file directly as "json.hpp" | ||
| 26 | # create symlink to allow this usage | ||
| 27 | do_install_append() { | ||
| 28 | ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp | ||
| 29 | } | ||
