diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-25 14:47:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-25 14:47:08 (GMT) |
| commit | 9722f8f9a5b1c1ec24b6cb6edf5edd59922e90a5 (patch) | |
| tree | 0cb433cd2420ba98566e5240b2e41a78f7ba1754 /Modules | |
| parent | b9dadca90b2b10a71ffca87a308dcbfef5058f3c (diff) | |
| parent | b94e855d5fbf5cae975034ce5d7836425c8ad87f (diff) | |
| download | CMake-9722f8f9a5b1c1ec24b6cb6edf5edd59922e90a5.zip CMake-9722f8f9a5b1c1ec24b6cb6edf5edd59922e90a5.tar.gz CMake-9722f8f9a5b1c1ec24b6cb6edf5edd59922e90a5.tar.bz2 | |
Merge topic 'FindBoost-1.61'
b94e855d FindBoost: Add support for Boost 1.61
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBoost.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index edfed8e..c3058ea 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -707,7 +707,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) set(_Boost_TIMER_DEPENDENCIES chrono system) set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) - elseif(NOT Boost_VERSION VERSION_LESS 106000 AND Boost_VERSION VERSION_LESS 106100) + elseif(NOT Boost_VERSION VERSION_LESS 106000 AND Boost_VERSION VERSION_LESS 106200) set(_Boost_CHRONO_DEPENDENCIES system) set(_Boost_COROUTINE_DEPENDENCIES context system) set(_Boost_FILESYSTEM_DEPENDENCIES system) @@ -821,7 +821,7 @@ else() # information in _Boost_COMPONENT_DEPENDENCIES. See the # instructions at the top of _Boost_COMPONENT_DEPENDENCIES. set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} - "1.60.0" "1.60" + "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" "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51" "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1" |