diff options
| author | Vic Luo <vicluo96@gmail.com> | 2016-12-07 10:37:18 +0800 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-08 08:20:08 -0500 |
| commit | c3b6b5babc0269a4b84093443bfb5ba273a6e11b (patch) | |
| tree | fb2db65bb28de0da22087d4a7570ca5e89cfa9df | |
| parent | db3499df5d06ab2cacc61e9f7720a33456aeafe4 (diff) | |
| download | cmake-c3b6b5babc0269a4b84093443bfb5ba273a6e11b.tar.gz | |
FindBoost: Add support for VS 2017
| -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 184fb0526c..ce4f47c4b9 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) |