From 1fdd632d0c5a73bc98b28ea1c5a4338afe967c96 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 16 Aug 2021 18:42:18 +0800
Subject: [PATCH] cmake: silence build output when building external deps

when download/building grafonnet-lib, dpdk, spdk, liburing and fio,
they dump lots of output during configuration and building phrases,
all of which is irrelevant to us. so let's just silence it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 cmake/modules/BuildDPDK.cmake                | 6 +++++-
 cmake/modules/BuildFIO.cmake                 | 7 ++++++-
 cmake/modules/BuildSPDK.cmake                | 6 +++++-
 cmake/modules/Builduring.cmake               | 6 +++++-
 monitoring/grafana/dashboards/CMakeLists.txt | 5 ++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index 63bd56df20cd2..bfa8ff0c285ac 100644
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -96,7 +96,11 @@ function(do_build_dpdk dpdk_dir)
     CONFIGURE_COMMAND ${make_cmd} config O=${dpdk_dir} T=${target}
     BUILD_COMMAND ${make_cmd} O=${dpdk_dir} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=${extra_cflags}
     BUILD_IN_SOURCE 1
-    INSTALL_COMMAND "")
+    INSTALL_COMMAND ""
+    LOG_CONFIGURE ON
+    LOG_BUILD ON
+    LOG_MERGED_STDOUTERR ON
+    LOG_OUTPUT_ON_FAILURE ON)
   if(NUMA_FOUND)
     set(numa "y")
   else()
diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake
index 8a466c61a446e..3cbb0a28fe302 100644
--- a/cmake/modules/BuildFIO.cmake
+++ b/cmake/modules/BuildFIO.cmake
@@ -21,7 +21,12 @@ function(build_fio)
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND <SOURCE_DIR>/configure
     BUILD_COMMAND ${make_cmd} fio EXTFLAGS=-Wno-format-truncation ${FIO_EXTLIBS}
-    INSTALL_COMMAND cp <BINARY_DIR>/fio ${CMAKE_BINARY_DIR}/bin)
+    INSTALL_COMMAND cp <BINARY_DIR>/fio ${CMAKE_BINARY_DIR}/bin
+    LOG_CONFIGURE ON
+    LOG_BUILD ON
+    LOG_INSTALL ON
+    LOG_MERGED_STDOUTERR ON
+    LOG_OUTPUT_ON_FAILURE ON)
 
   add_library(fio INTERFACE IMPORTED)
   add_dependencies(fio fio_ext)
diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake
index 676ec7fcd9f37..57348e7afae8d 100644
--- a/cmake/modules/BuildSPDK.cmake
+++ b/cmake/modules/BuildSPDK.cmake
@@ -58,7 +58,11 @@ macro(build_spdk)
     BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}"
     BUILD_IN_SOURCE 1
     BUILD_BYPRODUCTS ${spdk_libs}
-    INSTALL_COMMAND "")
+    INSTALL_COMMAND ""
+    LOG_CONFIGURE ON
+    LOG_BUILD ON
+    LOG_MERGED_STDOUTERR ON
+    LOG_OUTPUT_ON_FAILURE ON)
   unset(make_cmd)
   foreach(spdk_lib ${SPDK_LIBRARIES})
     add_dependencies(${spdk_lib} spdk-ext)
diff --git a/cmake/modules/Builduring.cmake b/cmake/modules/Builduring.cmake
index feb14f07d4af7..8683880f71163 100644
--- a/cmake/modules/Builduring.cmake
+++ b/cmake/modules/Builduring.cmake
@@ -22,7 +22,11 @@ function(build_uring)
     BUILD_IN_SOURCE 1
     BUILD_BYPRODUCTS "<SOURCE_DIR>/src/liburing.a"
     INSTALL_COMMAND ""
-    UPDATE_COMMAND "")
+    UPDATE_COMMAND ""
+    LOG_CONFIGURE ON
+    LOG_BUILD ON
+    LOG_MERGED_STDOUTERR ON
+    LOG_OUTPUT_ON_FAILURE ON)
   unset(make_cmd)
 
   ExternalProject_Get_Property(liburing_ext source_dir)
diff --git a/monitoring/grafana/dashboards/CMakeLists.txt b/monitoring/grafana/dashboards/CMakeLists.txt
index c97fee6f9af32..f9c09ea4e4a6b 100644
--- a/monitoring/grafana/dashboards/CMakeLists.txt
+++ b/monitoring/grafana/dashboards/CMakeLists.txt
@@ -21,7 +21,10 @@ if(WITH_GRAFANA)
     URL_MD5 0798752ed40864fa8b3db40a3c970642
     BUILD_COMMAND ""
     CONFIGURE_COMMAND ""
-    INSTALL_COMMAND "")
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD ON
+    LOG_MERGED_STDOUTERR ON
+    LOG_OUTPUT_ON_FAILURE ON)
   add_dependencies(tests
     ${name})
   ExternalProject_Get_Property(${name} SOURCE_DIR)
-- 
2.39.5