Skip to content

Commit 3b0293b

Browse files
committed
Exemplar updates since 2026-04-30
Removed superfluous comments around project() statement in CMakeLists.txt Added .swp and .orig to .gitignore Bumped infra/ beman-submodule to latest (project-agnostic Beman_/BEMAN_LOCKFILE names in use-fetch-content.cmake, README/typo/SPDX fixes) Annotated vcpkg example code block in CONTRIBUTING.md as shell (markdownlint fix) Added GCC 16 to CI matrix (promoted from 15) and demoted GCC 15 to the secondary tier alongside 14
1 parent cd2db95 commit 3b0293b

11 files changed

Lines changed: 110 additions & 134 deletions

.exemplar_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a8a97fdec16bfd081aa1814402f13b6a20327046
1+
07a42c8a3ace7b889d4d98df8f9ec3a4cf74887f

.github/workflows/ci_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
matrix_config: >
3737
{
3838
"gcc": [
39-
{ "versions": ["15"],
39+
{ "versions": ["16"],
4040
"tests": [
4141
{ "cxxversions": ["c++26"],
4242
"tests": [
@@ -54,7 +54,7 @@ jobs:
5454
}
5555
]
5656
},
57-
{ "versions": ["14"],
57+
{ "versions": ["15", "14"],
5858
"tests": [
5959
{ "cxxversions": ["c++26", "c++23"],
6060
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@
1010

1111
# ignore vscode settings
1212
.vscode
13+
14+
# ignore vim swap files
15+
.swp
16+
17+
# ignore merge/patch backup files
18+
.orig

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
cmake_minimum_required(VERSION 3.30...4.3)
44

55
project(
6-
beman.transform_view # CMake Project Name, which is also the name of the top-level
7-
# targets (e.g., library, executable, etc.).
6+
beman.transform_view
87
DESCRIPTION "A conditionally borrowed std::ranges::transform_view"
98
LANGUAGES CXX
109
VERSION 0.1.0

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ the project's dependencies, including GoogleTest.
6565

6666
Example commands:
6767

68-
```
68+
```shell
6969
cmake \
7070
-B build \
7171
-S . \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ You can disable building tests by setting CMake option `BEMAN_TRANSFORM_VIEW_BUI
7575
7676
| Compiler | Version | C++ Standards | Standard Library |
7777
|------------|---------|---------------|-------------------|
78-
| GCC | 15-14 | C++26, C++23 | libstdc++ |
78+
| GCC | 16-14 | C++26, C++23 | libstdc++ |
7979
| Clang | 22-19 | C++26, C++23 | libstdc++, libc++ |
8080
| Clang | 18 | C++23 | libstdc++ |
8181
| AppleClang | latest | C++26, C++23 | libc++ |

infra/.beman_submodule

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[beman_submodule]
22
remote=https://github.com/bemanproject/infra.git
3-
commit_hash=3a49dffbffbfd1c405ce36091dfc68ad02dd6965
3+
commit_hash=1b14bad2cd2cf0e44d1aeb608557e0e35ce27eaa

infra/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This repository is intended to be used as a beman-submodule in other Beman repos
2222
#### `beman_install_library`
2323

2424
The CMake modules in this repository are intended to be used by Beman libraries. Use the
25-
`beman_add_install_library_config()` function to install your library, along with header
25+
`beman_install_library()` function to install your library, along with header
2626
files, any metadata files, and a CMake config file for `find_package()` support.
2727

2828
```cmake
@@ -31,7 +31,7 @@ add_library(beman::something ALIAS beman.something)
3131
3232
# ... configure your target as needed ...
3333
34-
find_package(beman-install-library REQUIRED)
34+
include(infra/cmake/beman-install-library.cmake)
3535
beman_install_library(beman.something)
3636
```
3737

infra/cmake/llvm-libc++-toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: BSL-1.0
1+
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
22

33
# This toolchain file is not meant to be used directly,
44
# but to be invoked by CMake preset and GitHub CI.

infra/cmake/telemetry.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _ME="$(basename "${0}")"
2929
_print_help() {
3030
cat <<HEREDOC
3131
32-
Callback script to process CMake Insrumentation data
32+
Callback script to process CMake Instrumentation data
3333
https://cmake.org/cmake/help/latest/command/cmake_instrumentation.html
3434
3535
Usage:

0 commit comments

Comments
 (0)