Home Esplora Aiuto
Registrati Accedi
Apq
/
CMake
mirror da https://github.com/Kitware/CMake.git
1
0
Forka 0
File Problemi 0 Wiki
Sfoglia il codice sorgente

Merge branch 'FindBoost-backport-python-deps' into release-3.11

Merge-request: !2045
Brad King 7 anni fa
parent
0df2e30638 81cc993f89
commit
b28e093f6a
1 ha cambiato i file con 34 aggiunte e 34 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 34 34
      Modules/FindBoost.cmake

+ 34 - 34
Modules/FindBoost.cmake
Vedi File 

@@ -595,7 +595,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_FILESYSTEM_DEPENDENCIES system)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system thread)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
   elseif(NOT Boost_VERSION VERSION_LESS 103600 AND Boost_VERSION VERSION_LESS 103800)
 
@@ -603,7 +603,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system thread)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
   elseif(NOT Boost_VERSION VERSION_LESS 103800 AND Boost_VERSION VERSION_LESS 104300)
 
@@ -611,7 +611,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES date_time)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system thread date_time)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
@@ -620,7 +620,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES date_time)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system thread date_time)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
@@ -629,7 +629,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l random serialization)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES date_time)
 
     set(_Boost_WAVE_DEPENDENCIES serialization filesystem system thread date_time)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
@@ -638,7 +638,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES date_time)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread date_time)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
@@ -648,7 +648,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES date_time)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread date_time)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
@@ -658,7 +658,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES date_time)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread date_time)
 
@@ -669,7 +669,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l regex random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time)
 
@@ -681,7 +681,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l regex random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time)
 
@@ -694,7 +694,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES log_setup date_time system filesystem thread regex chrono)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l regex random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
@@ -707,7 +707,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES log_setup date_time system filesystem thread regex chrono)
 
     set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l regex random)
 
     set(_Boost_MPI_DEPENDENCIES serialization)
 
-    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
 
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
@@ -720,7 +720,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES log_setup date_time system filesystem thread regex chrono)
 
     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_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_RANDOM_DEPENDENCIES system)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
@@ -734,7 +734,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES log_setup date_time system 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_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_RANDOM_DEPENDENCIES system)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
@@ -748,7 +748,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES date_time log_setup system 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_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_RANDOM_DEPENDENCIES system)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_TIMER_DEPENDENCIES chrono system)
 
@@ -763,7 +763,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES date_time log_setup system 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_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_RANDOM_DEPENDENCIES system)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
@@ -778,7 +778,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES date_time log_setup system 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_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_RANDOM_DEPENDENCIES system)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
@@ -794,28 +794,28 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
 
     set(_Boost_LOG_DEPENDENCIES date_time log_setup system 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_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
 
     set(_Boost_RANDOM_DEPENDENCIES system)
 
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
   elseif(NOT Boost_VERSION VERSION_LESS 106500 AND Boost_VERSION VERSION_LESS 106700)
 
-      set(_Boost_CHRONO_DEPENDENCIES system)
 
-      set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
 
-      set(_Boost_COROUTINE_DEPENDENCIES context system)
 
-      set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
 
-      set(_Boost_FILESYSTEM_DEPENDENCIES system)
 
-      set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
-      set(_Boost_LOG_DEPENDENCIES date_time log_setup system 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_RANDOM_DEPENDENCIES system)
 
-      set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
-      set(_Boost_TIMER_DEPENDENCIES chrono system)
 
-      set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
-      set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
+    set(_Boost_CHRONO_DEPENDENCIES system)
 
+    set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
 
+    set(_Boost_COROUTINE_DEPENDENCIES context system)
 
+    set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
 
+    set(_Boost_FILESYSTEM_DEPENDENCIES system)
 
+    set(_Boost_IOSTREAMS_DEPENDENCIES regex)
 
+    set(_Boost_LOG_DEPENDENCIES date_time log_setup system 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${component_python_version} mpi serialization)
 
+    set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
 
+    set(_Boost_RANDOM_DEPENDENCIES system)
 
+    set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
 
+    set(_Boost_TIMER_DEPENDENCIES chrono system)
 
+    set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
 
+    set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
 
   else()
 
     if(NOT Boost_VERSION VERSION_LESS 106700)
 
       set(_Boost_CHRONO_DEPENDENCIES system)