[Cmake-commits] CMake branch, next, updated. v3.7.1-1642-g3defab1

[Brad King]

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  3defab1f56082a7fbf51cca39d51ae9a3d232f86 (commit)
       via  95e6a82d1e640b2faafa99e2b359ad68bbfe0f43 (commit)
      from  4bba79ad0ceb753c87c268eb1b66dc3d818223f0 (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=3defab1f56082a7fbf51cca39d51ae9a3d232f86
commit 3defab1f56082a7fbf51cca39d51ae9a3d232f86
Merge: 4bba79a 95e6a82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 8 08:16:44 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 8 08:16:44 2016 -0500

    Merge topic 'FindBoost-vs15' into next
    
    95e6a82d FindBoost: Fix MSVC2017 compatibility


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95e6a82d1e640b2faafa99e2b359ad68bbfe0f43
commit 95e6a82d1e640b2faafa99e2b359ad68bbfe0f43
Author:     Vic Luo <vicluo96 at gmail.com>
AuthorDate: Wed Dec 7 10:37:18 2016 +0800
Commit:     Vic Luo <vicluo96 at gmail.com>
CommitDate: Wed Dec 7 10:37:18 2016 +0800

    FindBoost: Fix MSVC2017 compatibility

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 9bd7a30..e6bf3dc 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -427,7 +427,9 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
   elseif (GHSMULTI)
     set(_boost_COMPILER "-ghs")
   elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      set(_boost_COMPILER "-vc150")
+    elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
       set(_boost_COMPILER "-vc140")
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
       set(_boost_COMPILER "-vc120")
@@ -882,7 +884,9 @@ macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar base
     else()
       set(_arch_suffix 32)
     endif()
-    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-15.0)
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
       list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
       list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0)

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

Summary of changes:
 Modules/FindBoost.cmake |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake