commit 41061e2c3198c0f597d4f6bb702b690a273ab45d
author Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 07:41:13 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 09:16:52 2020 -0500
tree 491b1c93fd03bfc7fb71e0d851325d95ce8860f8
parent 38fb598381a9fc7c4e2bbd7b585f788d0c7353e5

sdbusplus: use meson build

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

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3c5197..2715c4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,11 +102,11 @@
                          ${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)
 
     externalproject_add (nlohmann-json PREFIX
                          ${CMAKE_CURRENT_BINARY_DIR}/nlohmann-json