commit abae97aee88d812f6ec59317be0a04c75a435fb2
author William A. Kennington III <wak@google.com> Mon Nov 21 18:26:54 2022 -0800
committer William A. Kennington III <wak@google.com> Fri Dec 09 20:13:26 2022 +0000
tree e8b8ad5558cef923193e71d189b42a8d61b32d3a
parent fcc00392e8f70c2fc8f911595629869e2f6c6cfb

build: Fixups for local building

Change-Id: I38cc5c0afc57f10a5cae61ca1c72e838c58ba33b
Signed-off-by: William A. Kennington III <wak@google.com>

.gitignore

diff --git a/.gitignore b/.gitignore
index 6301280..638739b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
 /build*/
 /subprojects/*
-!/subprojects/*.wrap
+!/subprojects/CLI11.wrap
+!/subprojects/googletest.wrap
+!/subprojects/phosphor-dbus-interfaces.wrap
+!/subprojects/phosphor-logging.wrap
+!/subprojects/sdbusplus.wrap
+!/subprojects/sdeventplus.wrap
+!/subprojects/stdplus.wrap

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 42eef62..ccef9ca 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,10 +8,11 @@
 
 watchdog_deps = [
   CLI11_dep,
-  dependency('sdbusplus'),
-  dependency('sdeventplus'),
   dependency('phosphor-dbus-interfaces'),
   dependency('phosphor-logging'),
+  dependency('sdbusplus'),
+  dependency('sdeventplus'),
+  dependency('stdplus'),
 ]
 
 watchdog_lib = static_library(

subprojects/stdplus.wrap

diff --git a/subprojects/stdplus.wrap b/subprojects/stdplus.wrap
new file mode 100644
index 0000000..d49e9a1
--- /dev/null
+++ b/subprojects/stdplus.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+url = https://github.com/openbmc/stdplus
+revision = HEAD
+
+[provide]
+stdplus = stdplus_dep
+stdplus-gtest = stdplus_gtest_dep
+program_names = run_with_tmp