Главная Обзор Помощь
Вход
Apq
/
CMake
зеркало из https://github.com/Kitware/CMake.git
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Merge topic 'FindBoost-backport-python-deps'

81cc993f89 FindBoost: Backport versioned python dependencies for v1.35 to v1.66
557e68e1a3 FindBoost: Remove extra indentation in 1.65/1.66 dependency block

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2045
Brad King 7 лет назад
Родитель
ad83aa0f3d 81cc993f89
Сommit
c747d4ccb3
1 измененных файлов с 34 добавлено и 34 удалено
Разделённый вид Показать статистику Diff
  1. 34 34
      Modules/FindBoost.cmake

+ 34 - 34
Modules/FindBoost.cmake
Просмотреть файл 

@@ -585,7 +585,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)
 
@@ -593,7 +593,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)
 
@@ -601,7 +601,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)
 
@@ -610,7 +610,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)
 
@@ -619,7 +619,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)
 
@@ -628,7 +628,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)
 
@@ -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_TIMER_DEPENDENCIES chrono system)
 
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread date_time)
 
@@ -659,7 +659,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)
 
@@ -671,7 +671,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)
 
@@ -684,7 +684,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)
 
@@ -697,7 +697,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)
 
@@ -710,7 +710,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)
 
@@ -724,7 +724,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)
 
@@ -738,7 +738,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)
 
@@ -753,7 +753,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)
 
@@ -768,7 +768,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)
 
@@ -784,28 +784,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)