meson: add necessary subprojects

Enable the project to build outside of the OpenBMC Docker or Yocto
environments by providing subproject wrap files as necessary.  In
some cases, this requires adding additional dependencies in the meson
file due to them not currently being expressed.

Supply a .gitignore that is appropriate for a Meson project as the
current one seems to be from the time when this project used autoconf.

Signed-off-by: Patrick Williams <[email protected]>
Change-Id: Iea2ae8cb9e00d2aa726800ff09b42d93efc886fc

.gitignore

@@ -1,27 +1,3 @@
-# Test suite logs
-*.log
-
-# Code Coverage
-*.gcda
-*.gcno
-*.trs
-*-coverage*
-
-pidlist-gen.cpp
-sensorlist-gen.cpp
-zoneinfo-gen.cpp
-setsensor
-swampd
-*_unittest
-*_unittest.log
-*_unittest.trs
-test-suite.log
-
-# IDEs
-.idea/
-
-# Patches
-.pc/
-patches/
-
-phosphor-pid-control.service
+build*/
+subprojects/*
+!subprojects/*.wrap

meson.build

@@ -9,6 +9,8 @@ project(
     ]
 )
 
+cxx = meson.get_compiler('cpp')
+
 conf_data = configuration_data()
 
 bindir = get_option('prefix') / get_option('bindir')
@@ -50,12 +52,26 @@ sdbusplus_dep = dependency('sdbusplus')
 libsystemd_dep = dependency('libsystemd')
 ipmid_dep = dependency('libipmid')
 
+if cxx.has_header('nlohmann/json.hpp')
+    nlohmann_json_dep = declare_dependency()
+else
+    nlohmann_json_dep = dependency('nlohmann-json')
+endif
+
+if cxx.has_header('CLI/CLI.hpp')
+    CLI11_dep = declare_dependency()
+else
+    CLI11_dep = dependency('CLI11')
+endif
+
 deps = [
+    CLI11_dep,
+    ipmid_dep,
+    libsystemd_dep,
+    nlohmann_json_dep,
     phosphor_dbus_interfaces_dep,
     phosphor_logging_dep,
     sdbusplus_dep,
-    libsystemd_dep,
-    ipmid_dep,
 ]
 
 root_inc = include_directories(

subprojects/CLI11.wrap

@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/CLIUtils/CLI11.git
+revision = HEAD
+
+[provide]
+CLI11 = CLI11_dep

subprojects/nlohmann-json.wrap

@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/nlohmann/json
+revision = HEAD
+
+[provide]
+nlohmann-json = nlohmann_json_dep

subprojects/phosphor-dbus-interfaces.wrap

@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-dbus-interfaces.git
+revision = HEAD

subprojects/phosphor-host-ipmid.wrap

@@ -0,0 +1,8 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-host-ipmid
+revision = HEAD
+
+[provide]
+libipmid = ipmid_dep
+libchannellayer = channellayer_dep
+libuserlayer = userlayer_dep

subprojects/phosphor-logging.wrap

@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-logging.git
+revision = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep

subprojects/sdbusplus.wrap

@@ -0,0 +1,7 @@
+[wrap-git]
+url = https://github.com/openbmc/sdbusplus.git
+revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep
+program_names = sdbus++, sdbus++-gen-meson