[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-518-g84faf37

Kitware Robot kwrobot at kitware.com
Mon Mar 20 14:55:02 EDT 2017


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  84faf37444eb5882eb41b0491302a8a9b93f6b2c (commit)
       via  6bd28fd235f75d150b1a4849c5b134f5e2766764 (commit)
      from  1f39ec883542971bcbf6532c719e1949ebad2877 (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=84faf37444eb5882eb41b0491302a8a9b93f6b2c
commit 84faf37444eb5882eb41b0491302a8a9b93f6b2c
Merge: 1f39ec8 6bd28fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 20 18:46:57 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 20 14:48:29 2017 -0400

    Stage topic 'ml/FindBoost-1.64.0-beta'
    
    Topic-id: 23111
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/590


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bd28fd235f75d150b1a4849c5b134f5e2766764
commit 6bd28fd235f75d150b1a4849c5b134f5e2766764
Author:     Mateusz Łoskot <mateusz at loskot.net>
AuthorDate: Fri Mar 17 22:48:32 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 20 14:43:24 2017 -0400

    FindBoost: Add support for 1.64
    
    Update the module to enable finding components of Boost 1.64 (beta) from
    the upcoming release.  Also update the Boost library name mangling used
    for VS 2017 to match a change made to Boost upstream (vc150 => vc1410).

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index e795aad..7e42c10 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -428,7 +428,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
     set(_boost_COMPILER "-ghs")
   elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
-      set(_boost_COMPILER "-vc150")
+      set(_boost_COMPILER "-vc1410")
     elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
       set(_boost_COMPILER "-vc140")
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
@@ -742,7 +742,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
     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)
-  elseif(NOT Boost_VERSION VERSION_LESS 106300 AND Boost_VERSION VERSION_LESS 106400)
+  elseif(NOT Boost_VERSION VERSION_LESS 106300 AND Boost_VERSION VERSION_LESS 106500)
     set(_Boost_CHRONO_DEPENDENCIES system)
     set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
     set(_Boost_COROUTINE_DEPENDENCIES context system)
@@ -963,7 +963,7 @@ else()
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
+    "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"
     "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 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list