Skip to content

Move config file template from src/beman/exemplar to cmake/ #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ednolan merged 1 commit into from
Jan 4, 2026
Merged

Move config file template from src/beman/exemplar to cmake/ #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ include(infra/cmake/beman-install-library-config.cmake)

add_subdirectory(src/beman/exemplar)

find_package(beman-install-library REQUIRED)
beman_install_library(beman.exemplar)

if(BEMAN_EXEMPLAR_BUILD_TESTS)
enable_testing()
add_subdirectory(tests/beman/exemplar)
Expand Down
0 ...n/exemplar/beman.exemplar-config.cmake.in → cmake/beman.exemplar-config.cmake.in
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions cookiecutter/{{cookiecutter.project_name}}/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ include(infra/cmake/beman-install-library-config.cmake)

add_subdirectory(src/beman/{{cookiecutter.project_name}})

find_package(beman-install-library REQUIRED)
beman_install_library(beman.{{cookiecutter.project_name}})

if(BEMAN_{{cookiecutter.project_name.upper()}}_BUILD_TESTS)
enable_testing()
add_subdirectory(tests/beman/{{cookiecutter.project_name}})
Expand Down
0 ...okiecutter.project_name}}-config.cmake.in → ...okiecutter.project_name}}-config.cmake.in
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cookiecutter/{{cookiecutter.project_name}}/infra/.beman_submodule
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[beman_submodule]
remote=https://github.com/bemanproject/infra.git
commit_hash=ec701785a8106c2b7088c7928d6fe861e27d67bc
commit_hash=9f89e813b844915267b783289d386a09c69560d1
111 changes: 0 additions & 111 deletions cookiecutter/{{cookiecutter.project_name}}/infra/.github/workflows/beman-tidy.yml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions cookiecutter/{{cookiecutter.project_name}}/infra/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,3 @@ repos:
- id: gersemi
name: CMake linting
exclude: ^.*/tests/.*/data/ # Exclude test data directories

# Python linting and formatting
# config file: ruff.toml (not currently present but add if needed)
# https://docs.astral.sh/ruff/configuration/
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.13.2
hooks:
- id: ruff-check
files: ^tools/beman-tidy/
- id: ruff-format
files: ^tools/beman-tidy/
7 changes: 0 additions & 7 deletions cookiecutter/{{cookiecutter.project_name}}/infra/.pre-commit-hooks.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions cookiecutter/{{cookiecutter.project_name}}/infra/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<!-- SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -->

[![beman-tidy tests](https://github.com/bemanproject/infra/actions/workflows/beman-tidy.yml/badge.svg)](https://github.com/bemanproject/infra/actions/workflows/beman-tidy.yml)

This repository contains the infrastructure for The Beman Project. This is NOT a library repository,
so it does not respect the usual structure of a Beman library repository nor The Beman Standard!

Expand Down
2 changes: 1 addition & 1 deletion cookiecutter/{{cookiecutter.project_name}}/infra/cmake/beman-install-library-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function(beman_install_library name)
find_file(
config_file_template
NAMES "${package_name}-config.cmake.in"
PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
PATHS "${PROJECT_SOURCE_DIR}/cmake"
NO_DEFAULT_PATH
NO_CACHE
REQUIRED
Expand Down
3 changes: 0 additions & 3 deletions ...tter/{{cookiecutter.project_name}}/src/beman/{{cookiecutter.project_name}}/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ target_sources(
)

set_target_properties(beman.{{cookiecutter.project_name}} PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)

find_package(beman-install-library REQUIRED)
beman_install_library(beman.{{cookiecutter.project_name}})
2 changes: 1 addition & 1 deletion infra/.beman_submodule
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[beman_submodule]
remote=https://github.com/bemanproject/infra.git
commit_hash=ec701785a8106c2b7088c7928d6fe861e27d67bc
commit_hash=9f89e813b844915267b783289d386a09c69560d1
111 changes: 0 additions & 111 deletions infra/.github/workflows/beman-tidy.yml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions infra/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,3 @@ repos:
- id: gersemi
name: CMake linting
exclude: ^.*/tests/.*/data/ # Exclude test data directories

# Python linting and formatting
# config file: ruff.toml (not currently present but add if needed)
# https://docs.astral.sh/ruff/configuration/
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.13.2
hooks:
- id: ruff-check
files: ^tools/beman-tidy/
- id: ruff-format
files: ^tools/beman-tidy/
7 changes: 0 additions & 7 deletions infra/.pre-commit-hooks.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions infra/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<!-- SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -->

[![beman-tidy tests](https://github.com/bemanproject/infra/actions/workflows/beman-tidy.yml/badge.svg)](https://github.com/bemanproject/infra/actions/workflows/beman-tidy.yml)

This repository contains the infrastructure for The Beman Project. This is NOT a library repository,
so it does not respect the usual structure of a Beman library repository nor The Beman Standard!

Expand Down
2 changes: 1 addition & 1 deletion infra/cmake/beman-install-library-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function(beman_install_library name)
find_file(
config_file_template
NAMES "${package_name}-config.cmake.in"
PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
PATHS "${PROJECT_SOURCE_DIR}/cmake"
NO_DEFAULT_PATH
NO_CACHE
REQUIRED
Expand Down
3 changes: 0 additions & 3 deletions src/beman/exemplar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ target_sources(
)

set_target_properties(beman.exemplar PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)

find_package(beman-install-library REQUIRED)
beman_install_library(beman.exemplar)