diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-26 12:21:47 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-26 12:21:47 +0300 |
commit | 3ffd662586e017668f6c0a1c2f1c754f4db0bf4e (patch) | |
tree | 35cb9af1c2656d39be3a3b5db16edcf2bf37df02 /build_files/build_environment/cmake/boost.cmake | |
parent | be4f593758c5913705b43fa092ee0294b4e1bb0a (diff) | |
parent | 0cb5eae9d0617abedf745753c23061ddfcfd1416 (diff) |
Merge branch 'master' into tmp-workbench-shader-create-infostmp-workbench-shader-create-infos
Diffstat (limited to 'build_files/build_environment/cmake/boost.cmake')
-rw-r--r-- | build_files/build_environment/cmake/boost.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 5170a3a123e..f2944a41af8 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -25,8 +25,13 @@ else() endif() if(WIN32) - set(BOOST_TOOLSET toolset=msvc-14.1) - set(BOOST_COMPILER_STRING -vc141) + if(MSVC_VERSION GREATER_EQUAL 1920) # 2019 + set(BOOST_TOOLSET toolset=msvc-14.2) + set(BOOST_COMPILER_STRING -vc142) + else() # 2017 + set(BOOST_TOOLSET toolset=msvc-14.1) + set(BOOST_COMPILER_STRING -vc141) + endif() set(BOOST_CONFIGURE_COMMAND bootstrap.bat) set(BOOST_BUILD_COMMAND b2) |