diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-17 12:40:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-04-17 12:41:08 (GMT) |
| commit | 10815461dcd06be96ceb5c1fbd6a199ca0fbc75f (patch) | |
| tree | 340a8a59f81fe0662412f9873c9dcfc10e9f247c | |
| parent | d3190d6a730207a56ef2144566468975167a811e (diff) | |
| parent | 0d5953b373c2c0ce413122f7ad590b47e29b2d9c (diff) | |
| download | CMake-10815461dcd06be96ceb5c1fbd6a199ca0fbc75f.zip CMake-10815461dcd06be96ceb5c1fbd6a199ca0fbc75f.tar.gz CMake-10815461dcd06be96ceb5c1fbd6a199ca0fbc75f.tar.bz2 | |
Merge topic 'FindBoost-1.85' into release-3.29
0d5953b373 FindBoost: Add support for Boost 1.85
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9435
| -rw-r--r-- | Modules/FindBoost.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 248ea8b..54d1a78 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1394,7 +1394,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) 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.85.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.86.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") endif() endif() @@ -1669,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.84.0" "1.84" + "1.85.0" "1.85" "1.84.0" "1.84" "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" |