Skip to content

Commit a06fcac

Browse files
authored
Reduce ExternalProject output by default (#755)
1 parent f0fb014 commit a06fcac

File tree

5 files changed

+30
-3
lines changed

5 files changed

+30
-3
lines changed

cmake/configure.cmake

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,25 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
4242
set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
4343

4444
option(USE_COVERAGE "Enable coverage instrumentation" OFF)
45+
option(PPC_EXTERNAL_PROJECTS_VERBOSE
46+
"Show full configure/build/install logs for ExternalProject dependencies"
47+
OFF)
48+
49+
if(PPC_EXTERNAL_PROJECTS_VERBOSE)
50+
set(PPC_EXTERNAL_PROJECT_LOG_ARGS "")
51+
set(PPC_EXTERNAL_PROJECT_CMAKE_ARGS "")
52+
else()
53+
set(PPC_EXTERNAL_PROJECT_LOG_ARGS
54+
LOG_CONFIGURE
55+
ON
56+
LOG_BUILD
57+
ON
58+
LOG_INSTALL
59+
ON
60+
LOG_OUTPUT_ON_FAILURE
61+
ON)
62+
set(PPC_EXTERNAL_PROJECT_CMAKE_ARGS -DCMAKE_INSTALL_MESSAGE=NEVER)
63+
endif()
4564

4665
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
4766
set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib")

cmake/gtest.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ExternalProject_Add(
1515
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
1616
-DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
1717
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
18+
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
1819
-DCMAKE_C_FLAGS=-w
1920
-DCMAKE_CXX_FLAGS=-w
2021
-DBUILD_GMOCK=OFF
@@ -26,7 +27,8 @@ ExternalProject_Add(
2627
INSTALL_COMMAND
2728
"${CMAKE_COMMAND}" --install
2829
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $<CONFIG>
29-
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
30+
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install"
31+
${PPC_EXTERNAL_PROJECT_LOG_ARGS})
3032

3133
function(ppc_link_gtest exec_func_lib)
3234
# Add external project include directories

cmake/json.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ ExternalProject_Add(
1515
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
1616
-DCMAKE_CXX_STANDARD_REQUIRED=ON
1717
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
18+
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
1819
-DJSON_BuildTests=OFF
1920
BUILD_COMMAND
2021
"${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
2122
--config $<CONFIG> --parallel
2223
INSTALL_COMMAND
2324
"${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
24-
--config $<CONFIG> --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install")
25+
--config $<CONFIG> --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install"
26+
${PPC_EXTERNAL_PROJECT_LOG_ARGS})
2527

2628
function(ppc_link_json exec_func_lib)
2729
# Add external project include directories

cmake/libenvpp.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ExternalProject_Add(
1313
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
1414
-DCMAKE_CXX_STANDARD_REQUIRED=ON
1515
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
16+
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
1617
-DLIBENVPP_TESTS=OFF
1718
-DLIBENVPP_EXAMPLES=OFF
1819
BUILD_COMMAND
@@ -21,7 +22,8 @@ ExternalProject_Add(
2122
INSTALL_COMMAND
2223
"${CMAKE_COMMAND}" --install
2324
"${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config $<CONFIG>
24-
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install")
25+
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install"
26+
${PPC_EXTERNAL_PROJECT_LOG_ARGS})
2527

2628
string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
2729
if(cmake_build_type_lower STREQUAL "debug")

cmake/onetbb.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ if(NOT ENABLE_SYSTEM_TBB)
2727
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
2828
-DCMAKE_CXX_STANDARD_REQUIRED=ON
2929
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
30+
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
3031
-DTBB_STRICT=OFF
3132
-DTBB_TEST=OFF
3233
BUILD_COMMAND
@@ -36,6 +37,7 @@ if(NOT ENABLE_SYSTEM_TBB)
3637
"${CMAKE_COMMAND}" --install
3738
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config $<CONFIG> --prefix
3839
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
40+
${PPC_EXTERNAL_PROJECT_LOG_ARGS}
3941
TEST_COMMAND ${ppc_onetbb_TEST_COMMAND})
4042

4143
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/"

0 commit comments

Comments
 (0)