commit 3d8338012c31ed7e4c8dea56ad14ea037fe7902a
author Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 07:14:39 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 07:14:39 2020 -0500
tree d5bf2ec2d98d4c896ef22ac9fc1f624c18d89e03
parent 1bf712bcd6b8d06a5d412cdf03cdc05cb6d25901

sdbusplus: use meson build

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

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 547fef0..9511cfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,7 +285,7 @@
 # sdbusplus
 if (NOT ${YOCTO_DEPENDENCIES})
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/sdbusplus-src)
-    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
+    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/build)
 endif ()
 
 # Openssl

CMakeLists.txt.in

diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index ae2155a..c25df8b 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -9,11 +9,11 @@
 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 ""
+    ${CMAKE_BINARY_DIR}/sdbusplus-src && meson build -Ddefault_library=static
+    && ninja -C build libsdbusplus.a INSTALL_COMMAND ""
     LOG_DOWNLOAD ON
 )