Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GoogleTest to release 1.11.0 #3352

Merged
merged 3 commits into from
Jun 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,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
Expand Down
2 changes: 1 addition & 1 deletion gtest
Submodule gtest updated 200 files