commit a1ed140b5351e1b264471b0462cc4eab753fbda6
author Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 10:28:30 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 10:28:51 2022 -0500
tree e7d77c3ef6f6beab5971bc52c34ac7223e97de82
parent a6cd704bda72e39e1b94652a9eb0733da8498791

meson: simplify dependencies

Leverage wrapfile `[provide]` directives to simplify the dependency
searching in the meson.build.

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

meson.build

diff --git a/meson.build b/meson.build
index 240ff40..9c95d58 100644
--- a/meson.build
+++ b/meson.build
@@ -14,12 +14,7 @@
     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',
-        ]
-    )
+    nlohmann_json = dependency('nlohmann_json')
 endif
 
 executable(
@@ -28,25 +23,10 @@
         'healthMonitor.cpp',
     ],
     dependencies: [
-        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' ],
-        ),
+        dependency('phosphor-dbus-interfaces'),
+        dependency('phosphor-logging'),
+        dependency('sdbusplus'),
+        dependency('sdeventplus'),
         nlohmann_json,
     ],
     install: true,

subprojects/nlohmann-json.wrap

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

subprojects/phosphor-dbus-interfaces.wrap

diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap
index 935a8b2..346aa0c 100644
--- a/subprojects/phosphor-dbus-interfaces.wrap
+++ b/subprojects/phosphor-dbus-interfaces.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
 url = https://github.com/openbmc/phosphor-dbus-interfaces.git
 revision = HEAD
+
+[provide]
+phosphor-dbus-interfaces = phosphor_dbus_interfaces_dep

subprojects/phosphor-logging.wrap

diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
index a039fcf..71eee8b 100644
--- a/subprojects/phosphor-logging.wrap
+++ b/subprojects/phosphor-logging.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
 url = https://github.com/openbmc/phosphor-logging.git
 revision = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep

subprojects/sdbusplus.wrap

diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
index d470130..7b076d0 100644
--- a/subprojects/sdbusplus.wrap
+++ b/subprojects/sdbusplus.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
 url = https://github.com/openbmc/sdbusplus.git
 revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep

subprojects/sdeventplus.wrap

diff --git a/subprojects/sdeventplus.wrap b/subprojects/sdeventplus.wrap
index 085bb5e..f871ac0 100644
--- a/subprojects/sdeventplus.wrap
+++ b/subprojects/sdeventplus.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
 url = https://github.com/openbmc/sdeventplus.git
 revision = HEAD
+
+[provide]
+sdeventplus = sdeventplus_dep