Skip to content

Update infra#200

Closed
steve-downey wants to merge 242 commits intobemanproject:mainfrom
steve-downey:update-subtree
Closed

Update infra#200
steve-downey wants to merge 242 commits intobemanproject:mainfrom
steve-downey:update-subtree

Conversation

@steve-downey
Copy link
Copy Markdown
Member

No description provided.

ednolan and others added 26 commits March 15, 2026 16:33
These variables were commented out and never set, but still referenced
in both install(TARGETS) blocks. Without VERSION_SUFFIX, they expanded
to empty strings, silently falling through to CMake defaults. Remove the
dead definitions and the dangling references so the code matches its
actual behavior.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
The previous logic used option() to create a per-package cache variable
defaulting to ON, then checked it in an if/elseif chain before the
allow-list. Since option() always defined the variable, the allow-list
branch was unreachable — BEMAN_INSTALL_CONFIG_FILE_PACKAGES was silently
ignored.

Restore the original precedence:
  1. Per-package var (if user explicitly set it, wins in either direction)
  2. Allow-list (if defined, packages not in it are excluded)
  3. Default: ON

Also removes the option() call and dead "if(NOT DEFINED)" block that
obscured the logic. Users who need the per-package override can pass it
directly via -D on the command line.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
Versioned install destinations (e.g. include/beman-0.1.0/) are a package
manager concern, not something the build system should attempt. Supporting
it here creates a combinatorial explosion of configurations without
solving the underlying problem.

Removes the VERSION_SUFFIX option, its keyword parsing, the conditional
_version_suffix/_include_install_dir logic, and all references.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
This is superseded by beman-install-library.cmake.
Previously, when the library was brought in via FetchContent, users
would need to add this line:

list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/extras)

This commit isolates the workaround to use-fetch-content.cmake, as
it's not needed when Catch2 is installed on the system or brought in
via another, non-FetchContent-based method.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
Name option variables after module.
Install based on package name rather than project name.
I have no real opinion about cmake formatting at this point other than wishing it was automated everywhere.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Bumps the github-actions group with 2 updates: [step-security/harden-runner](https://github.com/step-security/harden-runner) and [step-security/changed-files](https://github.com/step-security/changed-files).


Updates `step-security/harden-runner` from 2.16.1 to 2.17.0
- [Release notes](https://github.com/step-security/harden-runner/releases)
- [Commits](step-security/harden-runner@fe10465...f808768)

Updates `step-security/changed-files` from 47.0.1 to 47.0.5
- [Release notes](https://github.com/step-security/changed-files/releases)
- [Commits](step-security/changed-files@60967b8...2e07db7)

---
updated-dependencies:
- dependency-name: step-security/harden-runner
  dependency-version: 2.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: step-security/changed-files
  dependency-version: 47.0.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps the github-owned-actions group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/upload-artifact` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@bbbca2d...043fb46)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-owned-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
…thub-actions-3de8e4b2f3

Bump the github-actions group with 2 updates
…thub-owned-actions-4684ddd577

Bump actions/upload-artifact from 7.0.0 to 7.0.1 in the github-owned-actions group
Commit 752a065 renamed the BEMAN prefix to BEMAN_INSTALL in
beman-install-library.cmake but did not apply the rename to
Config.cmake.in, causing @BEMAN_FIND_DEPENDENCIES@ to expand to
an empty string and silently dropping all dependency declarations.

Fixes #43

Co-Authored-By: Claude Opus 4.6 <[email protected]>
Add tools for configuring and using the cmake_instrumentation available as an
experimental feature in CMake 4.2.

https://cmake.org/cmake/help/latest/command/cmake_instrumentation.html

This module sets the CMAKE_EXPERIMENTAL_INSTRUMENTATION gate with the GUID for
CMake 4.2.

It sets a single callback script and processes all current HOOKs copying the
Google Trace format json files to a known location for further processing.
lint

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
lint

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
reformat

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Improve the diagnostic messages for different versions of CMake.  Remove the
min required call.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
git-subtree-dir: infra
git-subtree-mainline: f2cf13f
git-subtree-split: 300e594
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.