dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update GoogleTest to release 1.11.0 (#3352)

Browse source 
* Update GoogleTest to release 1.11.0

* Explicitly set GOOGLETEST_VERSION

* Update .gitmodules
This commit is contained in:
Sergey Kroshnin 2021-06-25 13:57:24 +03:00 • committed by GitHub
commit ec2f62e50d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitmodules vendored
View file

@ -14,7 +14,6 @@
[submodule "gtest"] [submodule "gtest"]
path = gtest path = gtest
url = https://github.com/google/googletest.git url = https://github.com/google/googletest.git
branch = v1.8.x
[submodule "cpptoml"] [submodule "cpptoml"]
path = cpptoml path = cpptoml
url = https://github.com/cryptocode/cpptoml.git url = https://github.com/cryptocode/cpptoml.git

2
CMakeLists.txt
View file

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

2
gtest

@ -1 +1 @@
Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e Subproject commit e2239ee6043f73722e7aa812a459f54a28552929