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.

Sign up for GitHub

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

bump googletest version to match bazel #1868

Merged
merged 2 commits into from
Oct 24, 2024
Merged

bump googletest version to match bazel #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
970b5e4
bump googletest version to match bazel
dmah42 Oct 23, 2024
517191e
bump minimum cmake to 3.13 per supported versions
dmah42 Oct 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-min-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions cmake/GoogleTest.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required (VERSION 3.13...3.22)

project(googletest-download NONE)

Expand Down Expand Up @@ -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"
Expand Down
Loading