Skip to content

Commit

Permalink
Use cmake workflow preset on CI
Browse files Browse the repository at this point in the history
Update README
Bump minimum cmake version
  • Loading branch information
ClausKlein committed Dec 7, 2024
1 parent b70856b commit 405286d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
run: |
set -x
cmake --install .build --config RelWithDebInfo --verbose
- name: CMake Debug Test
- name: CMake Debug Workflow
run: |
set -x
cmake --build .build --config Debug --target test -- -k 0
cmake --workflow --preset clang-19
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

set(CMAKE_SKIP_TEST_ALL_DEPENDENCY FALSE)

cmake_minimum_required(VERSION 3.27...3.31)
cmake_minimum_required(VERSION 3.29...3.31)

project(beman_optional26 VERSION 0.0.0 LANGUAGES CXX)
project(beman_optional26 VERSION 0.0.1 LANGUAGES CXX)

# Includes
include(CPack)
Expand Down Expand Up @@ -98,4 +98,5 @@ add_custom_target(
COMMENT "Running gcovr to process coverage results"
COMMAND mkdir -p coverage
COMMAND gcovr --config gcovr.cfg .
DEPENDS test
)
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 6,
"cmakeMinimumRequired": {
"major": 3,
"minor": 27,
"minor": 29,
"patch": 2
},
"configurePresets": [
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ apt-get install -y cmake make ninja-build

# Example of toolchains:
apt-get install \
g++-14 gcc-14 gcc-13 g++-14 \
g++-14 gcc-14 gcc-13 g++-13 \
clang-18 clang++-18 clang-17 clang++-17
```

Expand All @@ -162,8 +162,12 @@ Available workflow presets:
"system"
"gcc-14"
"gcc-13"
"gcc-12"
"clang-20"
"clang-19"
"clang-18"
"clang-17"
"clang-16"

# Run examples:
$ cmake --workflow --preset gcc-14
Expand Down
6 changes: 3 additions & 3 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# cmake-format: on

cmake_minimum_required(VERSION 3.27...3.31)
cmake_minimum_required(VERSION 3.29...3.31)

project(beman_optional26_example VERSION 0.0.0 LANGUAGES CXX)
project(beman_optional26_example VERSION 0.0.1 LANGUAGES CXX)

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

if(PROJECT_IS_TOP_LEVEL)
find_package(beman_optional26 0.0.0 EXACT REQUIRED)
find_package(beman_optional26 0.0.1 EXACT REQUIRED)
endif()

# List of all buildable examples.
Expand Down

0 comments on commit 405286d

Please sign in to comment.