update googletest to 1.11.0 (#1916)

This fixes a build issue caused by gcc 11 changing the rules about what constitutes a `-Werror=maybe-uninitialized` error (see google/googletest#3024) As a side benefit, this simplifies the build script by removing the need for a few patches.
naruhitokaide · Jan 13, 2022 · fa67d13 · fa67d13
1 parent ad89218
commit fa67d13
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 41 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
-add_subdirectory(${CMAKE_SOURCE_DIR}/build/local/src/gtest/googletest-release-1.10.0
+add_subdirectory(${CMAKE_SOURCE_DIR}/build/local/src/gtest/googletest-release-1.11.0
                  ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
                  EXCLUDE_FROM_ALL)
 

diff --git a/tools/gtest.patch b/tools/gtest.patch
diff --git a/tools/gtest_mock.patch b/tools/gtest_mock.patch
diff --git a/tools/gtest_test.patch b/tools/gtest_test.patch
diff --git a/tools/install-dependencies b/tools/install-dependencies
@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH="$PREFIX/lib"
 export LD_RUN_PATH="$PREFIX/lib"
 
 # Download Google Test
-export GTEST_VERSION=1.10.0
+export GTEST_VERSION=1.11.0
 GTEST_DIR="$ROOT/build/local/src/gtest"
 mkdir -p "$GTEST_DIR"
 cd "$GTEST_DIR"
@@ -26,12 +26,6 @@ tar xzf release-$GTEST_VERSION.tar.gz
 
 # Build gtest
 cd googletest-release-$GTEST_VERSION
-echo "patching cmake minimum version"
-cp $ROOT/tools/*.patch .
-patch CMakeLists.txt gtest.patch
-patch googletest/CMakeLists.txt gtest_test.patch
-patch googlemock/CMakeLists.txt gtest_mock.patch
-
 cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -H.
 make -j4
 make install