From 1356beecedc0a051bae4a24ea080d74b313ca099 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 11 Nov 2024 15:09:31 +0100 Subject: [PATCH 1/2] build: Make Boost 1.85 a hard failure when building the Examples In the Examples, we require UB-free boost for the event data model to work --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5209e0d210..d3800f9f098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,6 +282,10 @@ if(ACTS_SETUP_BOOST) find_package(Boost ${_acts_boost_version} REQUIRED COMPONENTS) endif() + set(_severity WARNING) + if(ACTS_BUILD_EXAMPLES) + set(_severity FATAL_ERROR) + endif() if(Boost_VERSION VERSION_LESS _acts_boost_recommended_version) message( WARNING @@ -291,7 +295,7 @@ if(ACTS_SETUP_BOOST) if(Boost_VERSION VERSION_EQUAL "1.85.0") message( - WARNING + ${_severity} "Boost 1.85.0 is known to be broken (https://github.com/boostorg/container/issues/273). Please use a different version." ) endif() From 72e75adf157cd7ac0463a048d560029bcc38f2e9 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Mon, 11 Nov 2024 17:30:36 +0100 Subject: [PATCH 2/2] change variable name --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3800f9f098..601264badc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,10 +282,6 @@ if(ACTS_SETUP_BOOST) find_package(Boost ${_acts_boost_version} REQUIRED COMPONENTS) endif() - set(_severity WARNING) - if(ACTS_BUILD_EXAMPLES) - set(_severity FATAL_ERROR) - endif() if(Boost_VERSION VERSION_LESS _acts_boost_recommended_version) message( WARNING @@ -294,8 +290,12 @@ if(ACTS_SETUP_BOOST) endif() if(Boost_VERSION VERSION_EQUAL "1.85.0") + set(_boost_version_severity WARNING) + if(ACTS_BUILD_EXAMPLES) + set(_boost_version_severity FATAL_ERROR) + endif() message( - ${_severity} + ${_boost_version_severity} "Boost 1.85.0 is known to be broken (https://github.com/boostorg/container/issues/273). Please use a different version." ) endif()