Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions cmake/configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,25 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_COMPILE_WARNING_AS_ERROR ON)

option(USE_COVERAGE "Enable coverage instrumentation" OFF)
option(PPC_EXTERNAL_PROJECTS_VERBOSE
"Show full configure/build/install logs for ExternalProject dependencies"
OFF)

if(PPC_EXTERNAL_PROJECTS_VERBOSE)
set(PPC_EXTERNAL_PROJECT_LOG_ARGS "")
set(PPC_EXTERNAL_PROJECT_CMAKE_ARGS "")
else()
set(PPC_EXTERNAL_PROJECT_LOG_ARGS
LOG_CONFIGURE
ON
LOG_BUILD
ON
LOG_INSTALL
ON
LOG_OUTPUT_ON_FAILURE
ON)
set(PPC_EXTERNAL_PROJECT_CMAKE_ARGS -DCMAKE_INSTALL_MESSAGE=NEVER)
endif()

set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/ppc_onetbb/install/lib")
Expand Down
4 changes: 3 additions & 1 deletion cmake/gtest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ExternalProject_Add(
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
-DCMAKE_C_FLAGS=-w
-DCMAKE_CXX_FLAGS=-w
-DBUILD_GMOCK=OFF
Expand All @@ -26,7 +27,8 @@ ExternalProject_Add(
INSTALL_COMMAND
"${CMAKE_COMMAND}" --install
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $<CONFIG>
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install"
${PPC_EXTERNAL_PROJECT_LOG_ARGS})

function(ppc_link_gtest exec_func_lib)
# Add external project include directories
Expand Down
4 changes: 3 additions & 1 deletion cmake/json.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ ExternalProject_Add(
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_CXX_STANDARD_REQUIRED=ON
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
-DJSON_BuildTests=OFF
BUILD_COMMAND
"${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
--config $<CONFIG> --parallel
INSTALL_COMMAND
"${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build"
--config $<CONFIG> --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install")
--config $<CONFIG> --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install"
${PPC_EXTERNAL_PROJECT_LOG_ARGS})

function(ppc_link_json exec_func_lib)
# Add external project include directories
Expand Down
4 changes: 3 additions & 1 deletion cmake/libenvpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ExternalProject_Add(
-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
-DCMAKE_CXX_STANDARD_REQUIRED=ON
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
-DLIBENVPP_TESTS=OFF
-DLIBENVPP_EXAMPLES=OFF
BUILD_COMMAND
Expand All @@ -21,7 +22,8 @@ ExternalProject_Add(
INSTALL_COMMAND
"${CMAKE_COMMAND}" --install
"${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config $<CONFIG>
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install")
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install"
${PPC_EXTERNAL_PROJECT_LOG_ARGS})

string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
if(cmake_build_type_lower STREQUAL "debug")
Expand Down
2 changes: 2 additions & 0 deletions cmake/onetbb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ if(NOT ENABLE_SYSTEM_TBB)
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_CXX_STANDARD_REQUIRED=ON
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
${PPC_EXTERNAL_PROJECT_CMAKE_ARGS}
-DTBB_STRICT=OFF
-DTBB_TEST=OFF
BUILD_COMMAND
Expand All @@ -36,6 +37,7 @@ if(NOT ENABLE_SYSTEM_TBB)
"${CMAKE_COMMAND}" --install
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config $<CONFIG> --prefix
"${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install"
${PPC_EXTERNAL_PROJECT_LOG_ARGS}
TEST_COMMAND ${ppc_onetbb_TEST_COMMAND})

install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install/"
Expand Down
Loading