Skip to content

Commit

Permalink
Merge pull request #173 from ValeevGroup/evaleev/cmake/minimal-boost-…
Browse files Browse the repository at this point in the history
…version

[cmake] insist on Boost 1.71 or later, if discovering
  • Loading branch information
evaleev authored Feb 1, 2024
2 parents 4e8f523 + 45ca46d commit 20167a3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
13 changes: 13 additions & 0 deletions external/boost.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# -*- mode: cmake -*-

# update the Boost version that we can tolerate
if (NOT DEFINED Boost_OLDEST_BOOST_VERSION)
set(Boost_OLDEST_BOOST_VERSION ${BTAS_OLDEST_BOOST_VERSION})
else()
if (${Boost_OLDEST_BOOST_VERSION} VERSION_LESS ${BTAS_OLDEST_BOOST_VERSION})
if (DEFINED CACHE{Boost_OLDEST_BOOST_VERSION})
set(Boost_OLDEST_BOOST_VERSION "${BTAS_OLDEST_BOOST_VERSION}" CACHE STRING "Oldest Boost version to use" FORCE)
else()
set(Boost_OLDEST_BOOST_VERSION ${BTAS_OLDEST_BOOST_VERSION})
endif()
endif()
endif()

# Boost can be discovered by every (sub)package but only the top package can *build* it ...
# in either case must declare the components used by BTAS
set(required_components
Expand Down
4 changes: 2 additions & 2 deletions external/versions.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(BTAS_TRACKED_VGCMAKEKIT_TAG d5c0a6f9ff6dc97cbb5132912733e1eb1cf73f1e)

# likely can use earlier, but
# oldest Boost we can tolerate ... likely can use an earlier version, but:
# - as of oct 2023 tested with 1.71 and up only
# - avoids the need to avoid 1.70 in which Boost.Container is broken
# - matches the version provided by https://github.com/Orphis/boost-cmake as of oct 2023
set(BTAS_TRACKED_BOOST_VERSION 1.71)
set(BTAS_OLDEST_BOOST_VERSION 1.71)

0 comments on commit 20167a3

Please sign in to comment.