Skip to content

Commit

Permalink
[INFRA] Bump CMake, googletest, googlebenchmark
Browse files Browse the repository at this point in the history
  • Loading branch information
eseiler committed Oct 20, 2022
1 parent f3fd91b commit d1b79e7
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
cancel-in-progress: false # PRs will be canceled by the clang-format CI

env:
CMAKE_VERSION: 3.15.7
CMAKE_VERSION: 3.16.9
SHARG_NO_VERSION_CHECK: 1
TZ: Europe/Berlin

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'push' }}

env:
CMAKE_VERSION: 3.15.7
CMAKE_VERSION: 3.16.9
SHARG_NO_VERSION_CHECK: 1
TZ: Europe/Berlin

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'push' }}

env:
CMAKE_VERSION: 3.15.7
CMAKE_VERSION: 3.16.9
SHARG_NO_VERSION_CHECK: 1
TZ: Europe/Berlin

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci_misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
build_threads: 2
test_threads: 1 # snippets create and delete files and some separate tests create/delete the same files
cxx_flags: "-std=c++20"
cmake: 3.15.7
cmake: 3.16.9
requires_toolchain: true
requires_ccache: true
skip_build_tests: false
Expand All @@ -57,7 +57,7 @@ jobs:
build_type: Debug
build_threads: 2
test_threads: 2
cmake: 3.15.7
cmake: 3.16.9
requires_toolchain: true
requires_ccache: true
skip_build_tests: false
Expand All @@ -70,7 +70,7 @@ jobs:
build_type: Debug
build_threads: 2
test_threads: 2
cmake: 3.15.7
cmake: 3.16.9
requires_toolchain: true
requires_ccache: true
skip_build_tests: false
Expand All @@ -80,7 +80,7 @@ jobs:
build: documentation
build_threads: 2
test_threads: 2
cmake: 3.15.7
cmake: 3.16.9
doxygen: 1.9.5
requires_toolchain: false
requires_ccache: false
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ If possible, provide tooling that performs the changes, e.g. a shell-script.

#### Dependencies
* We now use Doxygen version 1.9.5 to build our documentation ([\#145](https://github.com/seqan/sharg-parser/pull/145)).
* We require at least CMake 3.16 for our test suite. Note that the minimum requirement for using Sharg is unchanged
([\#135](https://github.com/seqan/sharg-parser/pull/135)).

# Release 1.0.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ VERSION
| | requirement | version | comment |
|-------------------|------------------------------------------------------|----------|---------------------------------------------|
|**compiler** | [GCC](https://gcc.gnu.org) | ≥ 10 | no other compiler is currently supported! |
|**build system** | [CMake](https://cmake.org) | ≥ 3.15 | optional, but recommended |
|**build system** | [CMake](https://cmake.org) | ≥ 3.16 | optional, but recommended |


## Sponsorships
Expand Down
4 changes: 2 additions & 2 deletions doc/setup/quickstart_cmake/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ works.
# Software
Requirements:
- gcc >= 10
- cmake >= 3.15
- cmake >= 3.16
- git

## Installing GCC
Expand Down Expand Up @@ -160,7 +160,7 @@ int main()
To compile it, we first create a `CMakeLists.txt` file in the `source` directory:

```
cmake_minimum_required (VERSION 3.15)
cmake_minimum_required (VERSION 3.16)
project (sharg_tutorial CXX)
# add sharg to search path
Expand Down
5 changes: 2 additions & 3 deletions test/cmake/sharg_require_benchmark.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
# shipped with this file and also available at: https://github.com/seqan/sharg-parser/blob/main/LICENSE.md
# --------------------------------------------------------------------------------------------------------

# 3.14 is enough for the FetchContent feature, but it has a bug that prevents it from working.
cmake_minimum_required (VERSION 3.15)
cmake_minimum_required (VERSION 3.16)

# Exposes the google-benchmark target `gbenchmark`.
macro (sharg_require_benchmark)
enable_testing ()

set (gbenchmark_git_tag "v1.6.1")
set (gbenchmark_git_tag "v1.7.0")

message (STATUS "Fetch Google Benchmark:")

Expand Down
5 changes: 2 additions & 3 deletions test/cmake/sharg_require_test.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
# shipped with this file and also available at: https://github.com/seqan/sharg-parser/blob/main/LICENSE.md
# --------------------------------------------------------------------------------------------------------

# 3.14 is enough for the FetchContent feature, but it has a bug that prevents it from working.
cmake_minimum_required (VERSION 3.15)
cmake_minimum_required (VERSION 3.16)

# Exposes the google-test targets `gtest` and `gtest_main`.
macro (sharg_require_test)
enable_testing ()

set (gtest_git_tag "release-1.11.0")
set (gtest_git_tag "release-1.12.1")

message (STATUS "Fetch Google Test:")

Expand Down

0 comments on commit d1b79e7

Please sign in to comment.