Skip to content

Commit 405286d

Browse files
committed
Use cmake workflow preset on CI
Update README Bump minimum cmake version
1 parent b70856b commit 405286d

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
run: |
108108
set -x
109109
cmake --install .build --config RelWithDebInfo --verbose
110-
- name: CMake Debug Test
110+
- name: CMake Debug Workflow
111111
run: |
112112
set -x
113-
cmake --build .build --config Debug --target test -- -k 0
113+
cmake --workflow --preset clang-19

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
set(CMAKE_SKIP_TEST_ALL_DEPENDENCY FALSE)
66

7-
cmake_minimum_required(VERSION 3.27...3.31)
7+
cmake_minimum_required(VERSION 3.29...3.31)
88

9-
project(beman_optional26 VERSION 0.0.0 LANGUAGES CXX)
9+
project(beman_optional26 VERSION 0.0.1 LANGUAGES CXX)
1010

1111
# Includes
1212
include(CPack)
@@ -98,4 +98,5 @@ add_custom_target(
9898
COMMENT "Running gcovr to process coverage results"
9999
COMMAND mkdir -p coverage
100100
COMMAND gcovr --config gcovr.cfg .
101+
DEPENDS test
101102
)

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": 6,
33
"cmakeMinimumRequired": {
44
"major": 3,
5-
"minor": 27,
5+
"minor": 29,
66
"patch": 2
77
},
88
"configurePresets": [

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ apt-get install -y cmake make ninja-build
141141

142142
# Example of toolchains:
143143
apt-get install \
144-
g++-14 gcc-14 gcc-13 g++-14 \
144+
g++-14 gcc-14 gcc-13 g++-13 \
145145
clang-18 clang++-18 clang-17 clang++-17
146146
```
147147

@@ -162,8 +162,12 @@ Available workflow presets:
162162
"system"
163163
"gcc-14"
164164
"gcc-13"
165+
"gcc-12"
166+
"clang-20"
167+
"clang-19"
165168
"clang-18"
166169
"clang-17"
170+
"clang-16"
167171

168172
# Run examples:
169173
$ cmake --workflow --preset gcc-14

examples/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44
# cmake-format: on
55

6-
cmake_minimum_required(VERSION 3.27...3.31)
6+
cmake_minimum_required(VERSION 3.29...3.31)
77

8-
project(beman_optional26_example VERSION 0.0.0 LANGUAGES CXX)
8+
project(beman_optional26_example VERSION 0.0.1 LANGUAGES CXX)
99

1010
set(BEMAN_OPTIONAL26_LIBRARY "Beman::Optional26::beman_optional26")
1111

1212
if(PROJECT_IS_TOP_LEVEL)
13-
find_package(beman_optional26 0.0.0 EXACT REQUIRED)
13+
find_package(beman_optional26 0.0.1 EXACT REQUIRED)
1414
endif()
1515

1616
# List of all buildable examples.

0 commit comments

Comments
 (0)