[Cmake-commits] CMake branch, next, updated. v3.4.2-2082-g54f9e33
Brad King
brad.king at kitware.com
Fri Jan 22 08:36:16 EST 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 54f9e335ddf7cd14e89f63eb688ad01c56b1a4fa (commit)
via b94e855d5fbf5cae975034ce5d7836425c8ad87f (commit)
from d194d14ba6d2d685ce50a01830f00f07f67650b7 (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=54f9e335ddf7cd14e89f63eb688ad01c56b1a4fa
commit 54f9e335ddf7cd14e89f63eb688ad01c56b1a4fa
Merge: d194d14 b94e855
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 22 08:36:15 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 22 08:36:15 2016 -0500
Merge topic 'FindBoost-1.61' into next
b94e855d FindBoost: Add support for Boost 1.61
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b94e855d5fbf5cae975034ce5d7836425c8ad87f
commit b94e855d5fbf5cae975034ce5d7836425c8ad87f
Author: Sergei Nikulov <sergey.nikulov at gmail.com>
AuthorDate: Fri Jan 22 10:50:25 2016 +0300
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 22 08:35:04 2016 -0500
FindBoost: Add support for Boost 1.61
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"
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list