diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-31 13:29:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-31 13:29:49 (GMT) |
| commit | 35e73f513b77e164120da2cfafb26d443efd4103 (patch) | |
| tree | 71846dd3c1cadd81f9c618be33aafe2dab42b370 | |
| parent | 9b4efcb92fc200d20b1ff3027cf819232db7060c (diff) | |
| parent | 468a995346271c02f2248adf3539fbb34edaef2e (diff) | |
| download | CMake-35e73f513b77e164120da2cfafb26d443efd4103.zip CMake-35e73f513b77e164120da2cfafb26d443efd4103.tar.gz CMake-35e73f513b77e164120da2cfafb26d443efd4103.tar.bz2 | |
Merge topic 'FindBoost-1.80' into release-3.24
468a995346 FindBoost: Add support for Boost 1.80
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com>
Merge-request: !7600
| -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 0f407c8..0cea239 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.80.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.81.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") endif() endif() @@ -1653,7 +1653,7 @@ else() # _Boost_COMPONENT_HEADERS. See the instructions at the top of # _Boost_COMPONENT_DEPENDENCIES. set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} - "1.79.0" "1.79" + "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" |