Pull infra subtree

CMakeLists.txt

@@ -1,15 +1,15 @@
 # CMakeLists.txt                                                    -*-CMake-*-
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-cmake_minimum_required(VERSION 3.27)
+cmake_minimum_required(VERSION 3.27...4.3)
 
 project(beman.optional VERSION 1.0.0 LANGUAGES CXX)
 
 # Includes
 include(CTest)
 include(FetchContent)
 
-set(TARGETS_EXPORT_NAME ${CMAKE_PROJECT_NAME}Targets)
+set(TARGETS_EXPORT_NAME ${PROJECT_NAME}Targets)
 
 option(
     OPTIONAL_ENABLE_TESTING
@@ -58,8 +58,8 @@ add_subdirectory(include/beman/optional)
 
 add_subdirectory(examples)
 
-find_package(beman-install-library REQUIRED)
-beman_install_library(beman.optional FILE_SET beman_optional_headers)
+include(infra/cmake/beman-install-library.cmake)
+beman_install_library(beman.optional TARGETS beman.optional)
 
 # Coverage
 configure_file("cmake/gcovr.cfg.in" gcovr.cfg @ONLY)

Makefile

@@ -73,10 +73,10 @@ compile:  ## Compile the project
 	cmake --build $(_build_path)  --config $(CONFIG) --target all -- -k 0
 
 compile-headers: $(_build_path)/CMakeCache.txt ## Compile the headers
-	 cmake --build $(_build_path)  --config $(CONFIG) --target all_verify_interface_header_sets -- -k 0
+	cmake --build $(_build_path)  --config $(CONFIG) --target all_verify_interface_header_sets -- -k 0
 
 install: $(_build_path)/CMakeCache.txt compile ## Install the project
-	cmake --install $(_build_path) --config $(CONFIG) --component beman.optional --verbose
+	cmake --install $(_build_path) --config $(CONFIG) --component optional_Development --verbose
 
 .PHONY: clean-install
 clean-install:

infra/.beman_submodule

@@ -0,0 +1,4 @@
+[beman_submodule]
+remote=https://github.com/bemanproject/infra.git
+commit_hash=63cb577f6484f13ce3349de49ad5ce27e20bf1da
+allow_untracked_files=True

infra/README.md

@@ -9,12 +9,11 @@ so it does not respect the usual structure of a Beman library repository nor The
 
 * `cmake/`: CMake modules and toolchain files used by Beman libraries.
 * `containers/`: Containers used for CI builds and tests in the Beman org.
-* `tools/`: Tools used to manage the infrastructure and the codebase (e.g., linting, formatting, etc.).
 
 ## Usage
 
 This repository is intended to be used as a beman-submodule in other Beman repositories. See
-[the Beman Submodule documentation](./tools/beman-submodule/README.md) for details.
+[the beman-submodule documentation](https://github.com/bemanproject/beman-submodule) for details.
 
 
 ### CMake Modules

infra/cmake/Config.cmake.in

@@ -0,0 +1,12 @@
+# cmake/Config.cmake.in -*-makefile-*-
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+include(CMakeFindDependencyMacro)
+
+@BEMAN_FIND_DEPENDENCIES@
+
+@PACKAGE_INIT@
+
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)
+
+check_required_components(@PROJECT_NAME@)