Skip to content

Commit c405c64

Browse files
committed
fixed cmake child process invocation for gtest and absl
1 parent c1b74e5 commit c405c64

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

firestore/integration_test_internal/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ if(ANDROID)
171171
${CMAKE_CURRENT_LIST_DIR}/external/abseil-cpp/CMakeLists.txt COPYONLY)
172172
execute_process(COMMAND ${CMAKE_COMMAND} .
173173
-G ${CMAKE_GENERATOR}
174-
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
175174
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
175+
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
176176
RESULT_VARIABLE result
177177
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/abseil-cpp )
178178
if(result)
@@ -214,6 +214,9 @@ if (NOT EXISTS ${GOOGLETEST_ROOT}/src/googletest/src/gtest-all.cc)
214214
configure_file(googletest.cmake
215215
${CMAKE_CURRENT_LIST_DIR}/external/googletest/CMakeLists.txt COPYONLY)
216216
execute_process(COMMAND ${CMAKE_COMMAND} .
217+
-G ${CMAKE_GENERATOR}
218+
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
219+
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
217220
RESULT_VARIABLE result
218221
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/googletest )
219222
if(result)

0 commit comments

Comments
 (0)