Skip to content

Update CMake FetchContent to use system installed Boost when available. #204

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
matthew-mccall merged 4 commits into from
Mar 10, 2026
Merged

Update CMake FetchContent to use system installed Boost when available. #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f2e63e
Refactor Boost integration in CMake configuration.
matthew-mccall Feb 27, 2026
d7d6726
Merge branch 'master' into cmake-find-package
matthew-mccall Mar 10, 2026
06b5ed7
[Actions] Format CMakeLists.txt
invalid-email-address Mar 10, 2026
a0750d5
Trigger workflow
matthew-mccall Mar 10, 2026
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: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ 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
Expand Down
2 changes: 2 additions & 0 deletions cmake/FetchBoost.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Loading