[Cmake-commits] CMake branch, next, updated. v3.4.1-1780-g1d104f2

[Roger Leigh]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1d104f29c75e8cb264b94bd1fa916ae769e4cb18 (commit)
       via  0a31fdabecd2724d456aef0664ad7da1ca28f359 (commit)
      from  ad8a17f8c2763e3ccabaf9c70580972fef0673a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d104f29c75e8cb264b94bd1fa916ae769e4cb18
commit 1d104f29c75e8cb264b94bd1fa916ae769e4cb18
Merge: ad8a17f 0a31fda
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Thu Dec 17 16:58:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 17 16:58:58 2015 -0500

    Merge topic 'boost-1.60' into next
    
    0a31fdab FindBoost: Add support for Boost 1.60


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a31fdabecd2724d456aef0664ad7da1ca28f359
commit 0a31fdabecd2724d456aef0664ad7da1ca28f359
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Thu Dec 17 21:46:58 2015 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Thu Dec 17 21:46:58 2015 +0000

    FindBoost: Add support for Boost 1.60

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index e517a6a..edfed8e 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -707,6 +707,20 @@ 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)
+    set(_Boost_CHRONO_DEPENDENCIES system)
+    set(_Boost_COROUTINE_DEPENDENCIES context system)
+    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_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()
     message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
     set(_Boost_IMPORTED_TARGETS FALSE)
@@ -807,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.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"

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBoost.cmake |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake