diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake index aa5624985..7f0f7d441 100644 --- a/cmake/gtest.cmake +++ b/cmake/gtest.cmake @@ -19,12 +19,12 @@ ExternalProject_Add( $<$:-Dgtest_force_shared_crt=ON> BUILD_COMMAND "${CMAKE_COMMAND}" --build - "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config - ${CMAKE_BUILD_TYPE} --parallel + "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $ + --parallel INSTALL_COMMAND "${CMAKE_COMMAND}" --install - "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --prefix - "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install") + "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $ + --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install") function(ppc_link_gtest exec_func_lib) # Add external project include directories diff --git a/cmake/json.cmake b/cmake/json.cmake index e7cb80c17..30706b156 100644 --- a/cmake/json.cmake +++ b/cmake/json.cmake @@ -16,10 +16,10 @@ ExternalProject_Add( -DJSON_BuildTests=OFF BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build" - --config ${CMAKE_BUILD_TYPE} --parallel + --config $ --parallel INSTALL_COMMAND "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/build" - --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install") + --config $ --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_json/install") function(ppc_link_json exec_func_lib) # Add external project include directories diff --git a/cmake/libenvpp.cmake b/cmake/libenvpp.cmake index 0d3adc23b..c7217a847 100644 --- a/cmake/libenvpp.cmake +++ b/cmake/libenvpp.cmake @@ -15,11 +15,11 @@ ExternalProject_Add( -DLIBENVPP_EXAMPLES=OFF BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" - --config ${CMAKE_BUILD_TYPE} --parallel + --config $ --parallel INSTALL_COMMAND "${CMAKE_COMMAND}" --install - "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --prefix - "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install") + "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/build" --config $ + --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_libenvpp/install") string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) if(cmake_build_type_lower STREQUAL "debug") @@ -48,5 +48,6 @@ function(ppc_link_envpp exec_func_lib) target_link_directories(${exec_func_lib} PUBLIC "${CMAKE_BINARY_DIR}/ppc_libenvpp/build") target_link_libraries(${exec_func_lib} PUBLIC ${PPC_ENVPP_LIB_NAME}) - target_link_libraries(${exec_func_lib} PUBLIC ${PPC_FMT_LIB_NAME}) + target_link_libraries(${exec_func_lib} PUBLIC $<$:fmtd> + $<$>:fmt>) endfunction() diff --git a/cmake/onetbb.cmake b/cmake/onetbb.cmake index c8b1a1a67..08ef716c9 100644 --- a/cmake/onetbb.cmake +++ b/cmake/onetbb.cmake @@ -29,10 +29,10 @@ if(NOT ENABLE_SYSTEM_TBB) -DTBB_TEST=OFF BUILD_COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" - --config ${CMAKE_BUILD_TYPE} --parallel + --config $ --parallel INSTALL_COMMAND "${CMAKE_COMMAND}" --install - "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --prefix + "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/build" --config $ --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_onetbb/install" TEST_COMMAND ${ppc_onetbb_TEST_COMMAND})