mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 14:57:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix [boost] find_package for MSVC2013 / v120 (#10670)

Browse Source 
* Fix [boost] find_package for MSVC2013 / v120

added conditional set(Boost_COMPILER "-vc120") to vcpkg.cmake

* fixed spacing

* fixed spaces
This commit is contained in:
Manuel Kugelmann 2020-08-02 00:02:50 +02:00 committed by GitHub
parent 8797e9b0f9
commit 0e08105aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/buildsystems/vcpkg.cmake
View File

@ -401,7 +401,11 @@ macro(${VCPKG_OVERRIDE_FIND_PACKAGE_NAME} name)
unset(Boost_USE_STATIC_RUNTIME) unset(Boost_USE_STATIC_RUNTIME)
set(Boost_NO_BOOST_CMAKE ON) set(Boost_NO_BOOST_CMAKE ON)
unset(Boost_USE_STATIC_RUNTIME CACHE) unset(Boost_USE_STATIC_RUNTIME CACHE)
if("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v120")
set(Boost_COMPILER "-vc120")
else()
set(Boost_COMPILER "-vc140") set(Boost_COMPILER "-vc140")
endif()
_find_package(${ARGV}) _find_package(${ARGV})
elseif("${name}" STREQUAL "ICU" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/unicode/utf.h") elseif("${name}" STREQUAL "ICU" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/unicode/utf.h")
function(_vcpkg_find_in_list) function(_vcpkg_find_in_list)