From c45d9c4c2fa077b7bb2018f1c52b0668b65d4b22 Mon Sep 17 00:00:00 2001 From: dominic <510002+dmah42@users.noreply.github.com> Date: Thu, 24 Oct 2024 09:46:02 +0100 Subject: [PATCH] bump googletest version to match bazel (#1868) * bump googletest version to match bazel * bump minimum cmake to 3.13 per supported versions --- .github/workflows/build-and-test-min-cmake.yml | 2 +- CMakeLists.txt | 2 +- cmake/GoogleTest.cmake.in | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-min-cmake.yml b/.github/workflows/build-and-test-min-cmake.yml index b4980062..25099842 100644 --- a/.github/workflows/build-and-test-min-cmake.yml +++ b/.github/workflows/build-and-test-min-cmake.yml @@ -20,7 +20,7 @@ jobs: - uses: lukka/get-cmake@latest with: - cmakeVersion: 3.10.0 + cmakeVersion: 3.13.0 - name: create build environment run: cmake -E make_directory ${{ runner.workspace }}/_build diff --git a/CMakeLists.txt b/CMakeLists.txt index a86a5686..3aac35fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Require CMake 3.10. If available, use the policies up to CMake 3.22. -cmake_minimum_required (VERSION 3.10...3.22) +cmake_minimum_required (VERSION 3.13...3.22) project (benchmark VERSION 1.9.0 LANGUAGES CXX) diff --git a/cmake/GoogleTest.cmake.in b/cmake/GoogleTest.cmake.in index ce653ac3..c7914467 100644 --- a/cmake/GoogleTest.cmake.in +++ b/cmake/GoogleTest.cmake.in @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required (VERSION 3.13...3.22) project(googletest-download NONE) @@ -38,7 +38,7 @@ else() ExternalProject_Add( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "v1.14.0" PREFIX "${CMAKE_BINARY_DIR}" STAMP_DIR "${CMAKE_BINARY_DIR}/stamp" DOWNLOAD_DIR "${CMAKE_BINARY_DIR}/download"