commit 19527c78a8ce8a97a2ef76929419ebc07a2e2865
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 16:05:11 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 18:37:07 2021 -0500
tree 577fe0731234635541edbedc3485e5c4d417b253
parent 5669015bc7be8faf7f33cf7732919e247cdb6531

meson: add subprojects to build

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia7a24e92715cca5ee890d67d7b645feada4ec68b

.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6da54be
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+build*/
+subprojects/*
+!subprojects/*.wrap

meson.build

diff --git a/meson.build b/meson.build
index e117413..240ff40 100644
--- a/meson.build
+++ b/meson.build
@@ -8,16 +8,46 @@
     meson_version: '>=0.57.0',
 )
 
+cpp = meson.get_compiler('cpp')
+
+if cpp.has_header('nlohmann/json.hpp')
+    nlohmann_json = declare_dependency()
+else
+    subproject('nlohmann-json')
+    nlohmann_json = declare_dependency(
+        include_directories: [
+            'subprojects/nlohmann-json/single_include',
+            'subprojects/nlohmann-json/single_include/nlohmann',
+        ]
+    )
+endif
+
 executable(
     'health-monitor',
     [
         'healthMonitor.cpp',
     ],
     dependencies: [
-        dependency('phosphor-logging'),
-        dependency('sdbusplus'),
-        dependency('phosphor-dbus-interfaces'),
-        dependency('sdeventplus'),
+        dependency(
+            'phosphor-dbus-interfaces',
+            fallback: [
+                'phosphor-dbus-interfaces',
+                'phosphor_dbus_interfaces_dep',
+            ],
+        ),
+        dependency(
+            'phosphor-logging',
+            fallback: [ 'phosphor-logging', 'phosphor_logging_dep' ],
+        ),
+        dependency(
+            'sdbusplus',
+            fallback: [ 'sdbusplus', 'sdbusplus_dep' ],
+        ),
+        dependency(
+            'sdeventplus',
+            fallback: [ 'sdeventplus', 'sdeventplus_dep' ],
+        ),
+        nlohmann_json,
     ],
     install: true,
     install_dir: get_option('bindir')

subprojects/nlohmann-json.wrap

diff --git a/subprojects/nlohmann-json.wrap b/subprojects/nlohmann-json.wrap
new file mode 100644
index 0000000..9096612
--- /dev/null
+++ b/subprojects/nlohmann-json.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/nlohmann/json.git
+revision = HEAD

subprojects/phosphor-dbus-interfaces.wrap

diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap
new file mode 100644
index 0000000..935a8b2
--- /dev/null
+++ b/subprojects/phosphor-dbus-interfaces.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-dbus-interfaces.git
+revision = HEAD

subprojects/phosphor-logging.wrap

diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
new file mode 100644
index 0000000..a039fcf
--- /dev/null
+++ b/subprojects/phosphor-logging.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-logging.git
+revision = HEAD

subprojects/sdbusplus.wrap

diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
new file mode 100644
index 0000000..d470130
--- /dev/null
+++ b/subprojects/sdbusplus.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/sdbusplus.git
+revision = HEAD

subprojects/sdeventplus.wrap

diff --git a/subprojects/sdeventplus.wrap b/subprojects/sdeventplus.wrap
new file mode 100644
index 0000000..085bb5e
--- /dev/null
+++ b/subprojects/sdeventplus.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/sdeventplus.git
+revision = HEAD