Skip to content

Commit 5e24f35

Browse files
Roger Leighjbeder
Roger Leigh
authored andcommitted
test: Upgrade googlemock 1.7.0 to googletest 1.8.0
Note that with the release of 1.8.0, googlemock and googletest are unified into a single release.
1 parent e2818c4 commit 5e24f35

File tree

358 files changed

+48876
-166985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+48876
-166985
lines changed

.codedocs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ EXAMPLE_PATH =
88

99
# One or more directories and files to exclude from documentation generation.
1010
# Use relative paths with respect to the repository root directory.
11-
EXCLUDE = test/gmock-1.7.0/
11+
EXCLUDE = test/gtest-1.8.0/
1212

1313
# One or more wildcard patterns to exclude files and directories from document
1414
# generation.

test/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(gtest_force_shared_crt ${MSVC_SHARED_RT} CACHE BOOL
22
"Use shared (DLL) run-time lib even when Google Test built as a static lib.")
3-
add_subdirectory(gmock-1.7.0)
4-
include_directories(SYSTEM gmock-1.7.0/gtest/include)
5-
include_directories(SYSTEM gmock-1.7.0/include)
3+
add_subdirectory(gtest-1.8.0)
4+
include_directories(SYSTEM gtest-1.8.0/googlemock/include)
5+
include_directories(SYSTEM gtest-1.8.0/googletest/include)
66

77
if(WIN32 AND BUILD_SHARED_LIBS)
88
add_definitions("-DGTEST_LINKED_AS_SHARED_LIBRARY")

0 commit comments

Comments
 (0)