diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-13 15:38:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-13 15:38:54 (GMT) |
| commit | 9bb203ed0f983305462a9d42ce9c906a292d42c1 (patch) | |
| tree | 8d0bd49c9d712c36b051ebfc4b34a56f1a6d88b5 /Modules/FindBoost.cmake | |
| parent | 247266aa3f1483c55e3169f02f10db59b87027f1 (diff) | |
| parent | 5045cd82d03c7cba5f9bd1a128996de289196b92 (diff) | |
| download | CMake-9bb203ed0f983305462a9d42ce9c906a292d42c1.zip CMake-9bb203ed0f983305462a9d42ce9c906a292d42c1.tar.gz CMake-9bb203ed0f983305462a9d42ce9c906a292d42c1.tar.bz2 | |
Merge topic 'FindBoost-1.69'
5045cd82d0 FindBoost: Additional fixes for 1.69
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2601
Diffstat (limited to 'Modules/FindBoost.cmake')
| -rw-r--r-- | Modules/FindBoost.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 7abddbd..ccd245b 100644 --- a/Modules/FindBoost.cmake +++ b/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" |