From ec2f62e50d42c460f00ee90105bfbea5ad29d401 Mon Sep 17 00:00:00 2001 From: Sergey Kroshnin Date: Fri, 25 Jun 2021 13:57:24 +0300 Subject: [PATCH] Update GoogleTest to release 1.11.0 (#3352) * Update GoogleTest to release 1.11.0 * Explicitly set GOOGLETEST_VERSION * Update .gitmodules --- .gitmodules | 1 - CMakeLists.txt | 2 ++ gtest | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bd4e9f6d..47b40b9e 100644 --- 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 index 9f0fc77d..c279bfce 100644 --- 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 index 703bd9ca..e2239ee6 160000 --- a/gtest +++ b/gtest @@ -1 +1 @@ -Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e +Subproject commit e2239ee6043f73722e7aa812a459f54a28552929