From 4f2e63e5721862612b1dc44fd5ef5f13e44b1aa6 Mon Sep 17 00:00:00 2001 From: Matthew McCall Date: Fri, 27 Feb 2026 18:17:58 -0500 Subject: [PATCH 1/3] Refactor Boost integration in CMake configuration. Simplified and unified Boost usage by replacing specific libraries with `Boost::boost` target. Adjusted FetchContent calls to include `FIND_PACKAGE_ARGS` and enabled compatibility targets. Updated Catch2 FetchContent for consistency. --- CMakeLists.txt | 4 +++- cmake/FetchBoost.cmake | 2 ++ src/CMakeLists.txt | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28d0229e..f21afaca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,9 @@ endif() FetchContent_Declare( Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG v3.4.0) + GIT_TAG v3.4.0 + FIND_PACKAGE_ARGS +) # Perhaps one day use Microsoft.GSL if # https://github.com/microsoft/GSL/issues/991 gets addressed diff --git a/cmake/FetchBoost.cmake b/cmake/FetchBoost.cmake index 73a7a2c6..2ea0d539 100644 --- a/cmake/FetchBoost.cmake +++ b/cmake/FetchBoost.cmake @@ -4,7 +4,9 @@ FetchContent_Declare( URL_HASH SHA256=7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5 DOWNLOAD_EXTRACT_TIMESTAMP ON EXCLUDE_FROM_ALL + FIND_PACKAGE_ARGS CONFIG ) set(BOOST_INCLUDE_LIBRARIES any callable_traits mpl) +set(BOOST_ENABLE_COMPATIBILITY_TARGETS ON) FetchContent_MakeAvailable(Boost) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b6e4a232..4378dbe8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,8 +62,7 @@ target_link_libraries(Oasis PUBLIC Oasis::Headers Eigen3::Eigen gsl::gsl-lite-v1) if(NOT OASIS_BUILD_JS) - target_link_libraries(Oasis PUBLIC Boost::any Boost::callable_traits - Boost::mpl) + target_link_libraries(Oasis PUBLIC Boost::boost) endif() source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${Oasis_SOURCES}) From 06b5ed736fe289173ab011dc75cf0c5c6504258f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 10 Mar 2026 20:24:52 +0000 Subject: [PATCH 2/3] [Actions] Format CMakeLists.txt --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f21afaca..74eb4cf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,8 +51,7 @@ FetchContent_Declare( Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_TAG v3.4.0 - FIND_PACKAGE_ARGS -) + FIND_PACKAGE_ARGS) # Perhaps one day use Microsoft.GSL if # https://github.com/microsoft/GSL/issues/991 gets addressed From a0750d5ecc013f8d697ca73820e9c7c6eab89450 Mon Sep 17 00:00:00 2001 From: Matthew McCall Date: Tue, 10 Mar 2026 16:25:39 -0400 Subject: [PATCH 3/3] Trigger workflow