[Cmake-commits] CMake branch, next, updated. v3.5.2-1399-g238b58f
Roger Leigh
rleigh at codelibre.net
Fri May 13 15:05:50 EDT 2016
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 238b58f12eaf04539a5e5d23aea474dfe3259b77 (commit)
via 328eff90eb49a2c8e89405cd5427a2a3bcdad977 (commit)
from 6a29f8cc449469c646fb0a063cf5796c0f569bca (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=238b58f12eaf04539a5e5d23aea474dfe3259b77
commit 238b58f12eaf04539a5e5d23aea474dfe3259b77
Merge: 6a29f8c 328eff9
Author: Roger Leigh <rleigh at codelibre.net>
AuthorDate: Fri May 13 15:05:48 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 13 15:05:48 2016 -0400
Merge topic 'boost-1.61' into next
328eff90 FindBoost: Update dependencies for Boost 1.61
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=328eff90eb49a2c8e89405cd5427a2a3bcdad977
commit 328eff90eb49a2c8e89405cd5427a2a3bcdad977
Author: Roger Leigh <r.leigh at dundee.ac.uk>
AuthorDate: Fri May 13 19:37:10 2016 +0100
Commit: Roger Leigh <r.leigh at dundee.ac.uk>
CommitDate: Fri May 13 19:39:41 2016 +0100
FindBoost: Update dependencies for Boost 1.61
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 3d573b8..59a1bff 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -709,7 +709,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 106200)
+ 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)
@@ -723,6 +723,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 106100 AND Boost_VERSION VERSION_LESS 106200)
+ set(_Boost_CHRONO_DEPENDENCIES system)
+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+ 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_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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list