commit e7c5aaad9990fa73dad2c05a4a573592284409b0
author William A. Kennington III <wak@google.com> Thu Oct 06 13:17:15 2022 -0700
committer William A. Kennington III <wak@google.com> Tue Oct 25 03:07:01 2022 -0700
tree abcdb765d911ff234fd7a59cce2da75d02f84947
parent 9a20a6ee1f76d0a80c2aa72f991f2df184aac282

build: Cleanup subprojects and gitignore

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

.gitignore

diff --git a/.gitignore b/.gitignore
index 327ea97..ae2d61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
 /build*/
-/subprojects/*/
+/subprojects/*
+!/subprojects/googletest.wrap
+!/subprojects/nlohmann_json.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 8f301ca..84c2f82 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,21 +1,6 @@
-phosphor_logging_dep = dependency('phosphor-logging')
-
 src_includes = include_directories('.')
 
-fmt_dep = dependency('fmt', required: false)
-if not fmt_dep.found()
-  fmt_opts = import('cmake').subproject_options()
-  fmt_opts.add_cmake_defines({
-    'CMAKE_POSITION_INDEPENDENT_CODE': 'ON',
-    'MASTER_PROJECT': 'OFF',
-  })
-  fmt_proj = import('cmake').subproject(
-    'fmt',
-    options: fmt_opts,
-    required: false)
-  assert(fmt_proj.found(), 'fmtlib is required')
-  fmt_dep = fmt_proj.dependency('fmt')
-endif
+stdplus_dep = dependency('stdplus')
 
 executable(
   'ncsi-netlink',
@@ -25,9 +10,9 @@
   implicit_include_directories: false,
   include_directories: src_includes,
   dependencies: [
-    fmt_dep,
     dependency('libnl-3.0'),
     dependency('libnl-genl-3.0'),
+    stdplus_dep,
   ],
   install: true,
   install_dir: get_option('bindir'))
@@ -48,11 +33,11 @@
 networkd_deps = [
   json_dep,
   phosphor_dbus_interfaces_dep,
-  phosphor_logging_dep,
+  dependency('phosphor-logging'),
   networkd_dbus_dep,
   sdbusplus_dep,
   dependency('sdeventplus'),
-  dependency('stdplus'),
+  stdplus_dep,
 ]
 
 conf_header = configure_file(

subprojects/fmt.wrap

diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap
deleted file mode 100644
index 6847ae5..0000000
--- a/subprojects/fmt.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/fmtlib/fmt
-revision = HEAD