76 lines
3.4 KiB
Diff
76 lines
3.4 KiB
Diff
|
From 897a149067b84375d094700632255c0b54f5e44c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Brad King <brad.king@kitware.com>
|
||
|
|
Date: Mon, 11 Sep 2023 09:50:54 -0400
|
||
|
|
Subject: [PATCH 7/9] FindBoost: Add support for Boost 1.83
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Update the list of known versions.
|
||
|
|
|
||
|
|
Run the command
|
||
|
|
|
||
|
|
cmake -DBOOST_DIR=/path/to/boost_1_83_0 \
|
||
|
|
-P Utilities/Scripts/BoostScanDeps.cmake
|
||
|
|
|
||
|
|
to extract dependencies from the 1.83.0 source tree.
|
||
|
|
|
||
|
|
Dependencies differ from 1.82, as mentioned in the 1.83 release notes:
|
||
|
|
|
||
|
|
* Boost.Timer no longer depends on Boost.Chrono
|
||
|
|
|
||
|
|
Fixes: #25243
|
||
|
|
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
||
|
|
---
|
||
|
|
Modules/FindBoost.cmake | 20 +++++++++++++++++---
|
||
|
|
1 file changed, 17 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
|
||
|
|
index f2e4804d04..1f82bb52a1 100644
|
||
|
|
--- a/Modules/FindBoost.cmake
|
||
|
|
+++ b/Modules/FindBoost.cmake
|
||
|
|
@@ -1365,7 +1365,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
|
||
|
|
set(_Boost_TIMER_DEPENDENCIES chrono)
|
||
|
|
set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
|
||
|
|
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
|
||
|
|
- else()
|
||
|
|
+ elseif(Boost_VERSION_STRING VERSION_LESS 1.83.0)
|
||
|
|
set(_Boost_CONTRACT_DEPENDENCIES thread chrono)
|
||
|
|
set(_Boost_COROUTINE_DEPENDENCIES context)
|
||
|
|
set(_Boost_FIBER_DEPENDENCIES context)
|
||
|
|
@@ -1380,7 +1380,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
|
||
|
|
set(_Boost_TIMER_DEPENDENCIES chrono)
|
||
|
|
set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
|
||
|
|
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
|
||
|
|
- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.83.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
|
||
|
|
+ else()
|
||
|
|
+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono)
|
||
|
|
+ set(_Boost_COROUTINE_DEPENDENCIES context)
|
||
|
|
+ set(_Boost_FIBER_DEPENDENCIES context)
|
||
|
|
+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
|
||
|
|
+ set(_Boost_JSON_DEPENDENCIES container)
|
||
|
|
+ set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic)
|
||
|
|
+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l)
|
||
|
|
+ set(_Boost_MPI_DEPENDENCIES serialization)
|
||
|
|
+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
|
||
|
|
+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
|
||
|
|
+ set(_Boost_THREAD_DEPENDENCIES chrono atomic)
|
||
|
|
+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
|
||
|
|
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
|
||
|
|
+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.84.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
|
||
|
|
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
@@ -1655,7 +1669,7 @@ else()
|
||
|
|
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
|
||
|
|
# _Boost_COMPONENT_DEPENDENCIES.
|
||
|
|
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
|
||
|
|
- "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79"
|
||
|
|
+ "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79"
|
||
|
|
"1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
|
||
|
|
"1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
|
||
|
|
"1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|