diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-08 13:25:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-08 13:25:08 (GMT) |
| commit | 12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (patch) | |
| tree | 45237fa962c628f242f54c3fa1c69a9d55ca5001 | |
| parent | f243a34cce8e4591e913566d86c1a28dc3df7996 (diff) | |
| parent | c3b6b5babc0269a4b84093443bfb5ba273a6e11b (diff) | |
| download | CMake-12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc.zip CMake-12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc.tar.gz CMake-12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc.tar.bz2 | |
Merge branch 'FindBoost-vs15' into release
| -rw-r--r-- | Modules/FindBoost.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
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) |