diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 41cfc5444ab..8d5be829e22 100644 --- 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 deleted file mode 100644 index 83138001530..00000000000 --- a/tools/gtest.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt 2019-10-03 23:52:15.000000000 +0900 -+++ CMakeLists.txt.patched 2021-01-29 10:16:41.000000000 +0900 -@@ -1,7 +1,7 @@ - # Note: CMake support is community-based. The maintainers do not use CMake - # internally. - --cmake_minimum_required(VERSION 2.8.8) -+cmake_minimum_required(VERSION 2.8.12) - - if (POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) diff --git a/tools/gtest_mock.patch b/tools/gtest_mock.patch deleted file mode 100644 index 2b9dfb81c62..00000000000 --- a/tools/gtest_mock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- googlemock/CMakeLists.txt 2019-10-03 23:52:15.000000000 +0900 -+++ googlemock/CMakeLists.txt.patched 2021-01-29 10:28:32.000000000 +0900 -@@ -42,7 +42,7 @@ - cmake_policy(SET CMP0048 NEW) - project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) - endif() --cmake_minimum_required(VERSION 2.6.4) -+cmake_minimum_required(VERSION 2.8.12) - - if (COMMAND set_up_hermetic_build) - set_up_hermetic_build() diff --git a/tools/gtest_test.patch b/tools/gtest_test.patch deleted file mode 100644 index 09b0d659c79..00000000000 --- a/tools/gtest_test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- googletest/CMakeLists.txt 2019-10-03 23:52:15.000000000 +0900 -+++ googletest/CMakeLists.txt.patched 2021-01-29 10:24:45.000000000 +0900 -@@ -53,7 +53,7 @@ - cmake_policy(SET CMP0048 NEW) - project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) - endif() --cmake_minimum_required(VERSION 2.6.4) -+cmake_minimum_required(VERSION 2.8.12) - - if (POLICY CMP0063) # Visibility - cmake_policy(SET CMP0063 NEW) diff --git a/tools/install-dependencies b/tools/install-dependencies index 78fcf02cb73..d28f7731f37 100755 --- 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