From 0e08105aa99967dd44399c36fec3d05a49f1c251 Mon Sep 17 00:00:00 2001 From: Manuel Kugelmann Date: Sun, 2 Aug 2020 00:02:50 +0200 Subject: [PATCH] [vcpkg] Fix [boost] find_package for MSVC2013 / v120 (#10670) * Fix [boost] find_package for MSVC2013 / v120 added conditional set(Boost_COMPILER "-vc120") to vcpkg.cmake * fixed spacing * fixed spaces --- scripts/buildsystems/vcpkg.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b0b4cde3e0..1b86504106 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -401,7 +401,11 @@ macro(${VCPKG_OVERRIDE_FIND_PACKAGE_NAME} name) unset(Boost_USE_STATIC_RUNTIME) set(Boost_NO_BOOST_CMAKE ON) unset(Boost_USE_STATIC_RUNTIME CACHE) - set(Boost_COMPILER "-vc140") + if("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v120") + set(Boost_COMPILER "-vc120") + else() + set(Boost_COMPILER "-vc140") + endif() _find_package(${ARGV}) elseif("${name}" STREQUAL "ICU" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/unicode/utf.h") function(_vcpkg_find_in_list)