61 lines
2.7 KiB
Diff
61 lines
2.7 KiB
Diff
From 5cbbe55de85bdd0d6d90241a9b18683f13375fc1 Mon Sep 17 00:00:00 2001
|
|
From: huangqinjin <huangqinjin@gmail.com>
|
|
Date: Sun, 28 May 2023 17:13:18 +0800
|
|
Subject: [PATCH 5/5] FindBoost: Add support for Boost 1.82
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Update the list of known versions.
|
|
|
|
There is a new header-only library, Boost.MySQL. It has no
|
|
dependencies and has a core header `<boost/mysql.hpp>`.
|
|
|
|
Run the command
|
|
|
|
cmake -DBOOST_DIR=/path/to/boost_1_82_0 \
|
|
-P Utilities/Scripts/BoostScanDeps.cmake
|
|
|
|
to extract dependencies from the 1.82.0 source tree.
|
|
They are the same as 1.81's dependencies, so just update
|
|
the version check for warning about newer versions.
|
|
|
|
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
|
---
|
|
Modules/FindBoost.cmake | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
|
|
index 72a9a4c192..f2e4804d04 100644
|
|
--- a/Modules/FindBoost.cmake
|
|
+++ b/Modules/FindBoost.cmake
|
|
@@ -1380,7 +1380,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)
|
|
- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.82.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
|
|
+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.83.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
|
|
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
|
|
endif()
|
|
endif()
|
|
@@ -1445,6 +1445,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
|
|
set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp")
|
|
set(_Boost_MPI_HEADERS "boost/mpi.hpp")
|
|
set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp")
|
|
+ set(_Boost_MYSQL_HEADERS "boost/mysql.hpp")
|
|
set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp")
|
|
set(_Boost_NOWIDE_HEADERS "boost/nowide/cstdlib.hpp")
|
|
set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp")
|
|
@@ -1654,7 +1655,7 @@ else()
|
|
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
|
|
# _Boost_COMPONENT_DEPENDENCIES.
|
|
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
|
|
- "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79"
|
|
+ "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.40.1
|
|
|