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.
fizyr-forks · Aug 25, 2017 · 5e24f35 · 5e24f35
1 parent e2818c4
commit 5e24f35
Show file tree

Hide file tree

Showing 358 changed files with 48,876 additions and 166,985 deletions.
diff --git a/.codedocs b/.codedocs
@@ -8,7 +8,7 @@ EXAMPLE_PATH =
 
 # One or more directories and files to exclude from documentation generation.
 # Use relative paths with respect to the repository root directory.
-EXCLUDE = test/gmock-1.7.0/
+EXCLUDE = test/gtest-1.8.0/
 
 # One or more wildcard patterns to exclude files and directories from document
 # generation.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(gtest_force_shared_crt ${MSVC_SHARED_RT} CACHE BOOL
   "Use shared (DLL) run-time lib even when Google Test built as a static lib.")
-add_subdirectory(gmock-1.7.0)
-include_directories(SYSTEM gmock-1.7.0/gtest/include)
-include_directories(SYSTEM gmock-1.7.0/include)
+add_subdirectory(gtest-1.8.0)
+include_directories(SYSTEM gtest-1.8.0/googlemock/include)
+include_directories(SYSTEM gtest-1.8.0/googletest/include)
 
 if(WIN32 AND BUILD_SHARED_LIBS)
   add_definitions("-DGTEST_LINKED_AS_SHARED_LIBRARY")