github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-25 20:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bump googletest version to match bazel (#1868)

Browse Source 
* bump googletest version to match bazel

* bump minimum cmake to 3.13 per supported versions
This commit is contained in:
dominic 2024-10-24 09:46:02 +01:00 committed by GitHub
parent be2134584d
commit c45d9c4c2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-and-test-min-cmake.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
- uses: lukka/get-cmake@latest - uses: lukka/get-cmake@latest
with: with:
cmakeVersion: 3.10.0 cmakeVersion: 3.13.0
- name: create build environment - name: create build environment
run: cmake -E make_directory ${{ runner.workspace }}/_build run: cmake -E make_directory ${{ runner.workspace }}/_build

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Require CMake 3.10. If available, use the policies up to CMake 3.22. # 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) project (benchmark VERSION 1.9.0 LANGUAGES CXX)

4
cmake/GoogleTest.cmake.in
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required (VERSION 3.13...3.22)
project(googletest-download NONE) project(googletest-download NONE)
@ -38,7 +38,7 @@ else()
ExternalProject_Add( ExternalProject_Add(
googletest googletest
GIT_REPOSITORY https://github.com/google/googletest.git GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG "release-1.11.0" GIT_TAG "v1.14.0"
PREFIX "${CMAKE_BINARY_DIR}" PREFIX "${CMAKE_BINARY_DIR}"
STAMP_DIR "${CMAKE_BINARY_DIR}/stamp" STAMP_DIR "${CMAKE_BINARY_DIR}/stamp"
DOWNLOAD_DIR "${CMAKE_BINARY_DIR}/download" DOWNLOAD_DIR "${CMAKE_BINARY_DIR}/download"