File tree Expand file tree Collapse file tree 4 files changed +6
-1
lines changed Expand file tree Collapse file tree 4 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,8 @@ ExternalProject_Add(ppc_googletest
7
7
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR} /ppc_googletest/install"
8
8
CONFIGURE_COMMAND "${CMAKE_COMMAND} " -S "${CMAKE_SOURCE_DIR} /3rdparty/googletest/" -B "${CMAKE_CURRENT_BINARY_DIR} /ppc_googletest/build/"
9
9
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -G${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
10
- -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -Dgtest_force_shared_crt=ON -DCMAKE_CXX_FLAGS= "-w" -DCMAKE_C_FLAGS= "-w"
10
+ -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
11
+ -Dgtest_force_shared_crt=ON -DCMAKE_CXX_FLAGS= "-w" -DCMAKE_C_FLAGS= "-w"
12
+ -D CMAKE_CXX_STANDARD =${CMAKE_CXX_STANDARD} -D CMAKE_CXX_STANDARD_REQUIRED=ON
11
13
BUILD_COMMAND "${CMAKE_COMMAND} " --build "${CMAKE_CURRENT_BINARY_DIR} /ppc_googletest/build" --config ${CMAKE_BUILD_TYPE} --parallel
12
14
INSTALL_COMMAND "${CMAKE_COMMAND} " --install "${CMAKE_CURRENT_BINARY_DIR} /ppc_googletest/build" --prefix "${CMAKE_CURRENT_BINARY_DIR} /ppc_googletest/install" )
Original file line number Diff line number Diff line change @@ -8,5 +8,6 @@ ExternalProject_Add(ppc_json
8
8
CONFIGURE_COMMAND "${CMAKE_COMMAND} " -S "${CMAKE_SOURCE_DIR} /3rdparty/json/" -B "${CMAKE_CURRENT_BINARY_DIR} /ppc_json/build/"
9
9
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
10
10
-D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
11
+ -D CMAKE_CXX_STANDARD =${CMAKE_CXX_STANDARD} -D CMAKE_CXX_STANDARD_REQUIRED=ON
11
12
BUILD_COMMAND "${CMAKE_COMMAND} " --build "${CMAKE_CURRENT_BINARY_DIR} /ppc_json/build" --config ${CMAKE_BUILD_TYPE} --parallel
12
13
INSTALL_COMMAND "${CMAKE_COMMAND} " --install "${CMAKE_CURRENT_BINARY_DIR} /ppc_json/build" --prefix "${CMAKE_CURRENT_BINARY_DIR} /ppc_json/install" )
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ ExternalProject_Add(ppc_libenvpp
10
10
CONFIGURE_COMMAND "${CMAKE_COMMAND} " -S "${CMAKE_SOURCE_DIR} /3rdparty/libenvpp/" -B "${CMAKE_CURRENT_BINARY_DIR} /ppc_libenvpp/build/"
11
11
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
12
12
-D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
13
+ -D CMAKE_CXX_STANDARD =${CMAKE_CXX_STANDARD} -D CMAKE_CXX_STANDARD_REQUIRED=ON
13
14
BUILD_COMMAND "${CMAKE_COMMAND} " --build "${CMAKE_CURRENT_BINARY_DIR} /ppc_libenvpp/build" --config ${CMAKE_BUILD_TYPE} --parallel
14
15
INSTALL_COMMAND "${CMAKE_COMMAND} " --install "${CMAKE_CURRENT_BINARY_DIR} /ppc_libenvpp/build" --prefix "${CMAKE_CURRENT_BINARY_DIR} /ppc_libenvpp/install" )
15
16
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ ExternalProject_Add(ppc_onetbb
19
19
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
20
20
-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
21
21
-G${CMAKE_GENERATOR} -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
22
+ -D CMAKE_CXX_STANDARD =${CMAKE_CXX_STANDARD} -D CMAKE_CXX_STANDARD_REQUIRED=ON
22
23
BUILD_COMMAND "${CMAKE_COMMAND} " --build "${CMAKE_CURRENT_BINARY_DIR} /ppc_onetbb/build" --config ${CMAKE_BUILD_TYPE} --parallel
23
24
INSTALL_COMMAND "${CMAKE_COMMAND} " --install "${CMAKE_CURRENT_BINARY_DIR} /ppc_onetbb/build" --prefix "${CMAKE_CURRENT_BINARY_DIR} /ppc_onetbb/install"
24
25
TEST_COMMAND ${ppc_onetbb_TEST_COMMAND}
You can’t perform that action at this time.
0 commit comments