Jelajahi Sumber

Merge topic 'boost-1.74.0'

0d86bb0902 FindBoost: Add 1.74 to known versions
1940e24d58 FindBoost: Prevent warning with boost 1.74

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5319
Brad King 5 tahun lalu
induk
melakukan
691cff7c01
1 mengubah file dengan 2 tambahan dan 1 penghapusan
  1. 2 1
      Modules/FindBoost.cmake

+ 2 - 1
Modules/FindBoost.cmake

@@ -1183,7 +1183,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
       set(_Boost_TIMER_DEPENDENCIES chrono)
       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.74.0)
+      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.75.0)
         message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
       endif()
     endif()
@@ -1455,6 +1455,7 @@ else()
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+    "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"
     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"