Skip to content

Commit 1f2a599

Browse files
authored
Address PR comment about indentation
1 parent 1972a34 commit 1f2a599

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

cmake/modules/GoogleTest.cmake

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,35 @@ else()
2727
set(build_cmd ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/ --config $<CONFIG>)
2828
endif()
2929

30-
ExternalProject_Add(
31-
googletest
32-
GIT_REPOSITORY https://github.com/google/googletest.git
33-
GIT_SHALLOW 1
34-
GIT_TAG v1.15.2
35-
UPDATE_COMMAND ""
36-
CONFIGURE_COMMAND ${config_cmd}
37-
-S ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest/
38-
-B ${CMAKE_BINARY_DIR}/unittests/googletest-prefix/src/googletest-build/
39-
-G ${CMAKE_GENERATOR}
40-
-DCMAKE_BUILD_TYPE=$<CONFIG>
41-
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
42-
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
43-
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
44-
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
45-
-DCMAKE_AR=${CMAKE_AR}
46-
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
47-
${EXTRA_GTEST_OPTS}
48-
BUILD_COMMAND ${build_cmd}
49-
# Disable install step
50-
INSTALL_COMMAND ""
51-
BUILD_BYPRODUCTS ${_gtest_byproducts}
52-
# Wrap download, configure and build steps in a script to log output
53-
LOG_DOWNLOAD ON
54-
LOG_CONFIGURE ON
55-
LOG_BUILD ON
56-
TIMEOUT 600
30+
ExternalProject_Add(
31+
googletest
32+
GIT_REPOSITORY https://github.com/google/googletest.git
33+
GIT_SHALLOW 1
34+
GIT_TAG v1.15.2
35+
UPDATE_COMMAND ""
36+
# # Force separate output paths for debug and release builds to allow easy
37+
# # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
38+
# CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=DebugLibs
39+
# -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
40+
# -Dgtest_force_shared_crt=ON
41+
CONFIGURE_COMMAND ${config_cmd}
42+
-DCMAKE_BUILD_TYPE=$<CONFIG>
43+
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
44+
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
45+
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
46+
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
47+
-DCMAKE_AR=${CMAKE_AR}
48+
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
49+
${EXTRA_GTEST_OPTS}
50+
BUILD_COMMAND ${build_cmd}
51+
# Disable install step
52+
INSTALL_COMMAND ""
53+
BUILD_BYPRODUCTS ${_gtest_byproducts}
54+
# Wrap download, configure and build steps in a script to log output
55+
LOG_DOWNLOAD ON
56+
LOG_CONFIGURE ON
57+
LOG_BUILD ON
58+
TIMEOUT 600
5759
)
5860

5961
# Specify include dirs for gtest and gmock

0 commit comments

Comments
 (0)