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 a46d43ca7cd96e722220b45664f5ecd52ae79e5d (commit) via c3b6b5babc0269a4b84093443bfb5ba273a6e11b (commit) from 3defab1f56082a7fbf51cca39d51ae9a3d232f86 (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=a46d43ca7cd96e722220b45664f5ecd52ae79e5d commit a46d43ca7cd96e722220b45664f5ecd52ae79e5d Merge: 3defab1 c3b6b5b Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Dec 8 08:21:11 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Dec 8 08:21:11 2016 -0500 Merge topic 'FindBoost-vs15' into next c3b6b5ba FindBoost: Add support for VS 2017 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3b6b5babc0269a4b84093443bfb5ba273a6e11b commit c3b6b5babc0269a4b84093443bfb5ba273a6e11b Author: Vic Luo <viclu...@gmail.com> AuthorDate: Wed Dec 7 10:37:18 2016 +0800 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Dec 8 08:20:08 2016 -0500 FindBoost: Add support for VS 2017 diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 184fb05..ce4f47c 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: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits