commit 0d26db385223027374d99aab4a2b4d8c3a8d1f05
author Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 07:45:28 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 10:20:31 2020 -0500
tree 399b34ad5ba3eb7eeeffeb8de9185fa84f9f38f4
parent 9dc4abd598c37e6e2bbcae31e42b7f36dbeec434

sdbusplus: use meson build

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

callback-manager/CMakeLists.txt

diff --git a/callback-manager/CMakeLists.txt b/callback-manager/CMakeLists.txt
index fef304d..56391ad 100644
--- a/callback-manager/CMakeLists.txt
+++ b/callback-manager/CMakeLists.txt
@@ -22,19 +22,19 @@
     externalproject_add (sdbusplus-project PREFIX
                          ${CMAKE_BINARY_DIR}/sdbusplus-project GIT_REPOSITORY
                          https://github.com/openbmc/sdbusplus.git GIT_TAG
-                         bed15f0cee4784acdf151cca14efdfb98cb9d397 SOURCE_DIR
+                         fa3137a78e952134559bf7c41c4f29fa4afabe02 SOURCE_DIR
                          ${CMAKE_BINARY_DIR}/sdbusplus-src BINARY_DIR
                          ${CMAKE_BINARY_DIR}/sdbusplus-build CONFIGURE_COMMAND
                          "" BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/sdbusplus-src
-                         && ./bootstrap.sh && ./configure --enable-transaction
-                         && make -j libsdbusplus.la INSTALL_COMMAND ""
+                         && meson build -Ddefault_library=static && ninja -C
+                         build libsdbusplus.a INSTALL_COMMAND ""
                          LOG_DOWNLOAD ON)
 
     include_directories (${CMAKE_BINARY_DIR}/sdbusplus-src)
     include_directories (${CMAKE_BINARY_DIR}/nlohmann/include)
     include_directories (${CMAKE_BINARY_DIR}/nlohmann/include/nlohmann)
     include_directories (${CMAKE_BINARY_DIR}/phosphor-dbus-interfaces/include)
-    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
+    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/build)
 
     include_directories (${CMAKE_BINARY_DIR}/boost-src)
     set (CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/boost-src ${CMAKE_PREFIX_PATH})

hsbp-manager/CMakeLists.txt

diff --git a/hsbp-manager/CMakeLists.txt b/hsbp-manager/CMakeLists.txt
index 1c0e56b..05febb5 100644
--- a/hsbp-manager/CMakeLists.txt
+++ b/hsbp-manager/CMakeLists.txt
@@ -52,16 +52,16 @@
     externalproject_add (sdbusplus-project PREFIX
                          ${CMAKE_BINARY_DIR}/sdbusplus-project GIT_REPOSITORY
                          https://github.com/openbmc/sdbusplus.git GIT_TAG
-                         4212292bcf136d04b38ba5116aa568b0fa312798 SOURCE_DIR
+                         fa3137a78e952134559bf7c41c4f29fa4afabe02 SOURCE_DIR
                          ${CMAKE_BINARY_DIR}/sdbusplus-src BINARY_DIR
                          ${CMAKE_BINARY_DIR}/sdbusplus-build CONFIGURE_COMMAND
                          "" BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/sdbusplus-src
-                         && ./bootstrap.sh && ./configure --enable-transaction
-                         && make -j libsdbusplus.la INSTALL_COMMAND ""
+                         && meson build -Ddefault_library=static && ninja -C
+                         build libsdbusplus.a INSTALL_COMMAND ""
                          LOG_DOWNLOAD ON)
 
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/sdbusplus-src)
-    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
+    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/build)
 
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/boost-src)
     set (CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/boost-src ${CMAKE_PREFIX_PATH})