Update GoogleTest to release 1.11.0 (#3352)

* Update GoogleTest to release 1.11.0 * Explicitly set GOOGLETEST_VERSION * Update .gitmodules
nanocurrency · Jun 25, 2021 · ec2f62e · ec2f62e
1 parent 4cd88f7
commit ec2f62e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,7 +14,6 @@
 [submodule "gtest"]
 	path = gtest
 	url = https://github.com/google/googletest.git
-	branch = v1.8.x
 [submodule "cpptoml"]
 	path = cpptoml
 	url = https://github.com/cryptocode/cpptoml.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -580,6 +580,8 @@ if(NANO_TEST OR RAIBLOCKS_TEST)
 
   add_subdirectory(nano/load_test)
 
+  # FIXME: This fixes googletest GOOGLETEST_VERSION requirement
+  set(GOOGLETEST_VERSION 1.11.0)
   add_subdirectory(gtest/googletest)
   # FIXME: This fixes gtest include directories without modifying gtest's
   # CMakeLists.txt. Ideally we should use GTest::GTest and GTest::Main as

diff --git a/gtest b/gtest