commit d85939552bf6631aae249d3d45d2208e7fd5610a
author Hao Jiang <jianghao@google.com> Fri Feb 12 11:27:47 2021 -0800
committer Willy Tu <wltu@google.com> Wed Jun 16 16:52:16 2021 +0000
tree 416be4d5e775e47b7b96cb2e0cdce103071782ff
parent 5235ae9ab3014bd9161a4ef1e1ce1a75567ffdbe

Bug fix: wrong cmake external project cmd format.

With original format of CONFIGURE_COMMAND/BUILD_COMMAND, cmake will
generate wrong argument list when logs are turned on.

The problem is justified on both cmake version of 3.16.3 and 3.18.4

Signed-off-by: Hao Jiang <jianghao@google.com>
Change-Id: I28d8d3de81703f797876bf144340a9a629ace1f6

CMakeLists.txt.in

diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index 9181ae5..c24d360 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -31,23 +31,26 @@
     host-ipmid PREFIX ${CMAKE_BINARY_DIR}/phosphor-host-ipmid GIT_REPOSITORY
     https://github.com/openbmc/phosphor-host-ipmid SOURCE_DIR
     ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src BINARY_DIR
-    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-build CONFIGURE_COMMAND cd
-    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src && export
-    PYTHONPATH=${CMAKE_BINARY_DIR}/prefix/lib/python2.7/site-packages:$ENV{PYTHONPATH}
-    && export PATH=${CMAKE_BINARY_DIR}/prefix/bin:$ENV{PATH} && export
-    PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/prefix/lib/pkgconfig && ./bootstrap.sh
-    && ./configure --prefix=${CMAKE_BINARY_DIR}/prefix
-    CPPFLAGS=-I${CMAKE_BINARY_DIR}/prefix/include/
-    CXXFLAGS=-Wno-error=unused-result LDFLAGS=-L${CMAKE_BINARY_DIR}/prefix/lib/
-    BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src && export
-    PYTHONPATH=${CMAKE_BINARY_DIR}/prefix/lib/python2.7/site-packages:$ENV{PYTHONPATH}
-    && export PATH=${CMAKE_BINARY_DIR}/prefix/bin:$ENV{PATH} && export
-    PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/prefix/lib/pkgconfig && make -j
-    verbose=1 INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src &&
+    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-build CONFIGURE_COMMAND /usr/bin/bash -c
+    "cd ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src && export \
+    PYTHONPATH=${CMAKE_BINARY_DIR}/prefix/lib/python2.7/site-packages:$ENV{PYTHONPATH} \
+    && export PATH=${CMAKE_BINARY_DIR}/prefix/bin:$ENV{PATH} && export \
+    PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/prefix/lib/pkgconfig && ./bootstrap.sh \
+    && ./configure --prefix=${CMAKE_BINARY_DIR}/prefix \
+    CPPFLAGS=\'-I${CMAKE_BINARY_DIR}/prefix/include/ \' \
+    CXXFLAGS=\'-Wno-error=unused-result \' \
+    LDFLAGS=\'-L${CMAKE_BINARY_DIR}/prefix/lib/ \'"
+    BUILD_COMMAND /usr/bin/bash -c "cd ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src && export \
+    PYTHONPATH=${CMAKE_BINARY_DIR}/prefix/lib/python2.7/site-packages:$ENV{PYTHONPATH} \
+    && export PATH=${CMAKE_BINARY_DIR}/prefix/bin:$ENV{PATH} && export \
+    PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/prefix/lib/pkgconfig && make -j \
+    verbose=1"
+    INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src &&
     make install && mkdir -p
     "${CMAKE_BINARY_DIR}/prefix/include/phosphor-ipmi-host" && cp
     sensorhandler.hpp selutility.hpp
-    "${CMAKE_BINARY_DIR}/prefix/include/phosphor-ipmi-host/" LOG_DOWNLOAD ON
+    "${CMAKE_BINARY_DIR}/prefix/include/phosphor-ipmi-host/" && echo "ipmid config finish"
+    LOG_BUILD ON LOG_CONFIGURE ON LOG_DOWNLOAD ON
 )
 
 externalproject_add (gtest GIT_REPOSITORY