commit b0475e7a5688fd9ab5c670adc630ad53d7de8607
author Matt Spinler <spinler@us.ibm.com> Mon Jul 17 14:24:03 2023 -0500
committer Matt Spinler <spinler@us.ibm.com> Mon Aug 21 19:03:30 2023 +0000
tree 0d712fc6f47e8f5ec5701c231f2ea75a0bec879f
parent 6f499e683ce9a589a10870e45007db52074edba6

Update nlohmann-json subproject handling

Without this, a build with subprojects would fail with:

```
meson.build:89:24: ERROR: Include dir subprojects/nlohmann-json/single_include does not exist.
```

Change-Id: I26e26a7a0473ffb163fc4ca9f1ac291f13de261e
Signed-off-by: Matt Spinler <spinler@us.ibm.com>

meson.build

diff --git a/meson.build b/meson.build
index 369d256..b9b2d87 100644
--- a/meson.build
+++ b/meson.build
@@ -85,13 +85,7 @@
 if cxx.has_header('nlohmann/json.hpp')
     nlohmann_json_dep = declare_dependency()
 else
-    subproject('nlohmann', required: false)
-    nlohmann_json_dep = declare_dependency(
-        include_directories: [
-            'subprojects/nlohmann-json/single_include',
-            'subprojects/nlohmann-json/single_include/nlohmann',
-        ]
-    )
+    nlohmann_json_dep = dependency('nlohmann-json')
 endif
 
 if cxx.has_header('CLI/CLI.hpp')

subprojects/nlohmann-json.wrap

diff --git a/subprojects/nlohmann-json.wrap b/subprojects/nlohmann-json.wrap
index a77b7c9..a2884b1 100644
--- a/subprojects/nlohmann-json.wrap
+++ b/subprojects/nlohmann-json.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
-revision = b3e5cb7f20dcc5c806e418df34324eca60d17d4e
-url = https://github.com/nlohmann/json.git
+url = https://github.com/nlohmann/json
+revision = HEAD
+
+[provide]
+nlohmann-json = nlohmann_json_dep