From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 14 Oct 2021 06:39:55 +0000 (+0800)
Subject: cmake: only pass --verbose when VERBOSE env variable is set
X-Git-Tag: v17.1.0~669^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2477d97c2541b398a1266cedf7f05a62dcea862;p=ceph.git

cmake: only pass --verbose when VERBOSE env variable is set

so that the setuptools is less chatty by default when building python
bindings.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---

diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
index 8dc69f0af518..2c0df43dea6a 100644
--- a/cmake/modules/Distutils.cmake
+++ b/cmake/modules/Distutils.cmake
@@ -75,6 +75,9 @@ function(distutils_add_cython_module target name src)
   endif()
   set(output_dir "${CYTHON_MODULE_DIR}/lib.3")
   set(setup_py ${CMAKE_CURRENT_SOURCE_DIR}/setup.py)
+  if(DEFINED ENV{VERBOSE})
+    set(maybe_verbose --verbose)
+  endif()
   add_custom_command(
     OUTPUT ${output_dir}/${name}${ext_suffix}
     COMMAND
@@ -89,7 +92,7 @@ function(distutils_add_cython_module target name src)
     CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
     CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     ${Python3_EXECUTABLE} ${setup_py}
-    build --verbose --build-base ${CYTHON_MODULE_DIR}
+    build ${maybe_verbose} --build-base ${CYTHON_MODULE_DIR}
     --build-platlib ${output_dir}
     MAIN_DEPENDENCY ${src}
     DEPENDS ${setup_py}
@@ -107,6 +110,9 @@ function(distutils_install_cython_module name)
   if(DU_DISABLE_VTA AND HAS_VTA)
     set(CFLAG_DISABLE_VTA -fno-var-tracking-assignments)
   endif()
+  if(DEFINED ENV{VERBOSE})
+    set(maybe_verbose --verbose)
+  endif()
   install(CODE "
     set(ENV{CC} \"${PY_CC}\")
     set(ENV{LDSHARED} \"${PY_LDSHARED}\")
@@ -130,12 +136,12 @@ function(distutils_install_cython_module name)
     execute_process(
        COMMAND
            ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
-           build --verbose --build-base ${CYTHON_MODULE_DIR}
+           build ${maybe_verbose} --build-base ${CYTHON_MODULE_DIR}
            --build-platlib ${CYTHON_MODULE_DIR}/lib.3
            build_ext --cython-c-in-temp --build-temp ${CMAKE_CURRENT_BINARY_DIR} --cython-include-dirs ${PROJECT_SOURCE_DIR}/src/pybind/rados
            install \${options} --single-version-externally-managed --record /dev/null
            egg_info --egg-base ${CMAKE_CURRENT_BINARY_DIR}
-           --verbose
+           ${maybe_verbose}
        WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\"
        RESULT_VARIABLE install_res)
     if(NOT \"\${install_res}\" STREQUAL 0)