Address PR comment

Author: mcbarton

cmake/modules/GoogleTest.cmake

@@ -20,24 +20,11 @@ endif()
 
 include(ExternalProject)
 if (EMSCRIPTEN)
-  set(CONFIGURE_COMMAND emcmake cmake -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-  		    -S ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest/
-		    -B ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/)
-  set(BUILD_COMMAND emmake make)
+  set(config_cmd emcmake cmake)
+  set(build_cmd emmake make)
 else()
-  set(CONFIGURE_COMMAND ${CMAKE_COMMAND} 
-  		-S ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest/
-		-B ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/
-    		-G ${CMAKE_GENERATOR}
-                -DCMAKE_BUILD_TYPE=$<CONFIG>
-                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-                -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-                -DCMAKE_AR=${CMAKE_AR}
-                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-                ${EXTRA_GTEST_OPTS})
-  set(BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/ --config $<CONFIG>)
+  set(config_cmd ${CMAKE_COMMAND})
+  set(build_cmd ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/ --config $<CONFIG>)
 endif()
 
   ExternalProject_Add(
@@ -46,8 +33,19 @@ endif()
     GIT_SHALLOW 1
     GIT_TAG v1.15.2
     UPDATE_COMMAND ""
-    CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
-    BUILD_COMMAND ${BUILD_COMMAND}
+    CONFIGURE_COMMAND ${config_cmd}
+    		  -S ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest/
+		  -B ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/
+    		  -G ${CMAKE_GENERATOR}
+                  -DCMAKE_BUILD_TYPE=$<CONFIG>
+                  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+                  -DCMAKE_AR=${CMAKE_AR}
+                  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                  ${EXTRA_GTEST_OPTS}
+    BUILD_COMMAND ${build_cmd}
     # Disable install step
     INSTALL_COMMAND ""
     BUILD_BYPRODUCTS ${_gtest_byproducts}