commit 63089f7e7ee0d9dbcacc05b5c6d630a2e335a46f
author Jonathan Doman <jonathan.doman@intel.com> Thu Jun 16 17:06:18 2022 -0700
committer Jonathan Doman <jonathan.doman@intel.com> Thu Jun 16 17:07:00 2022 -0700
tree 4838cefa584f56f7f55161478a40503d95ca97c7
parent a30229e13b8f320bdd23442e39b3a43b94b5545b

Fix phosphor-host-ipmid externalproject build

It switched to meson build system.

Signed-off-by: Jonathan Doman <jonathan.doman@intel.com>
Change-Id: Ic5914f0865f6cace569b775a85e6030f5277f182

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755
new mode 100644
index f7b4fd5..2cc888b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,14 +119,17 @@
 
         file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/prefix)
         externalproject_add (
-            phosphor-host-ipmid PREFIX ${CMAKE_BINARY_DIR}/phosphor-host-ipmid
+            phosphor-host-ipmid
+            PREFIX ${CMAKE_BINARY_DIR}/phosphor-host-ipmid
             GIT_REPOSITORY https://github.com/openbmc/phosphor-host-ipmid
             SOURCE_DIR ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src
-            CONFIGURE_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src &&
-            ./bootstrap.sh && ./configure --prefix=${CMAKE_BINARY_DIR}/prefix
-            BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src && make
-            INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src &&
-            make install LOG_DOWNLOAD ON)
+            CONFIGURE_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src
+                && meson --prefix=${CMAKE_BINARY_DIR}/prefix build-ext
+            BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src
+                && ninja -C build-ext
+            INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-src
+                && ninja -C build-ext install
+            LOG_DOWNLOAD ON)
         include_directories (${CMAKE_BINARY_DIR}/prefix/include)
         link_directories (${CMAKE_BINARY_DIR}/prefix/lib)