commit 55ae5a88829d11b5226ee07534582ab1ed509938
author Ed Tanous <edtanous@google.com> Mon Aug 02 14:00:02 2021 -0700
committer Ed Tanous <edtanous@google.com> Mon Aug 02 14:01:13 2021 -0700
tree e4aabd80231fc717446c57fb1a22a2f05a254547
parent e543757bcfe17c507b15e4aa49d62b169a033b4e

Revert "meson: nlohmann/json has a meson build"

and Revert "meson: Rework valijson subproject dependency"

This reverts commit 9fedd141288d36d41345305532251e4659535751.
and e7948f447eaeb3afaa78d5d298dc12b0730b8a84.

As they break the yocto build.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I8034a362f0866342a1527f468dc84a6ff1c67bd7

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 1a445b3..8a9811b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,7 +8,7 @@
     cpp_args: cpp_args + ['-DBOOST_ASIO_DISABLE_THREADS'],
     dependencies: [
         boost,
-        nlohmann_json_dep,
+        nlohmann_json,
         sdbusplus,
         valijson,
     ],
@@ -31,7 +31,7 @@
         dependencies: [
             boost,
             i2c,
-            nlohmann_json_dep,
+            nlohmann_json,
             sdbusplus,
             threads,
             valijson,