diff options
| author | Manuel Kugelmann <public@bitcraft.org> | 2020-08-02 00:02:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 15:02:50 -0700 |
| commit | 0e08105aa99967dd44399c36fec3d05a49f1c251 (patch) | |
| tree | 7da8e9c2a07ffaba6b358f898d6dff98ae410a61 /scripts/buildsystems/vcpkg.cmake | |
| parent | 8797e9b0f962c87d88ce2b9aec2a18302f4efdb9 (diff) | |
| download | vcpkg-0e08105aa99967dd44399c36fec3d05a49f1c251.tar.gz vcpkg-0e08105aa99967dd44399c36fec3d05a49f1c251.zip | |
[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
Diffstat (limited to 'scripts/buildsystems/vcpkg.cmake')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b0b4cde3e..1b8650410 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) |