Merge topic 'FindBoost-1.69'

5045cd82d0 FindBoost: Additional fixes for 1.69

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2601

Modules/FindBoost.cmake

@@ -873,9 +873,8 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
       set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono atomic)
       set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
       set(_Boost_MPI_DEPENDENCIES serialization)
-      set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
-      set(_Boost_NUMPY_DEPENDENCIES python)
-      set(_Boost_SYNC_DEPENDENCIES chrono atomic)
+      set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
+      set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
       set(_Boost_THREAD_DEPENDENCIES chrono date_time atomic)
       set(_Boost_TIMER_DEPENDENCIES chrono system)
       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
@@ -1129,6 +1128,7 @@ else()
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+    "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"
     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"

Utilities/Scripts/BoostScanDeps.cmake

@@ -51,12 +51,12 @@ function(_Boost_FIND_COMPONENT_DEPENDENCIES component includedir _ret_libs)
 
   # Special-case since it is part of mpi; look only in boost/mpi/python*
   if(component STREQUAL "mpi_python")
-    set(_boost_DEPS "python")
+    set(_boost_DEPS "python\${component_python_version}")
     set(library_component TRUE)
     set(_boost_unprocessed_headers ${_boost_mpi_python_headers})
   # Special-case since it is part of python; look only in boost/python/numpy*
   elseif(component STREQUAL "numpy")
-    set(_boost_DEPS "python")
+    set(_boost_DEPS "python\${component_python_version}")
     set(library_component TRUE)
     set(_boost_unprocessed_headers ${_boost_python_numpy_headers})
   # Special-case since it is a serialization variant; look in boost/serialization