Skip to content

Commit 8528098

Browse files
authored
Update GoogleTest.cmake
1 parent ffb2839 commit 8528098

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

cmake/modules/GoogleTest.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ if (EMSCRIPTEN)
2525
-B ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/)
2626
set(BUILD_COMMAND emmake make)
2727
else()
28-
set(CONFIGURE_COMMAND ${CMAKE_COMMAND} CMAKE_ARGS -G ${CMAKE_GENERATOR}
28+
set(CONFIGURE_COMMAND ${CMAKE_COMMAND} CMAKE_ARGS
29+
-S ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest/
30+
-B ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/
31+
-G ${CMAKE_GENERATOR}
2932
-DCMAKE_BUILD_TYPE=$<CONFIG>
3033
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
3134
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
@@ -34,7 +37,7 @@ else()
3437
-DCMAKE_AR=${CMAKE_AR}
3538
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
3639
${EXTRA_GTEST_OPTS})
37-
set(BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG>)
40+
set(BUILD_COMMAND ${CMAKE_COMMAND})
3841
endif()
3942

4043
ExternalProject_Add(

0 commit comments

Comments
 (0)