Skip to content

Commit

Permalink
Merge pull request #2 from ManuelKugelmann/ManuelKugelmann-patch-boos…
Browse files Browse the repository at this point in the history
…t-find_package_MSVC2013-v120-2

Manuel kugelmann patch boost find package msvc2013 v120 2
  • Loading branch information
ManuelKugelmann authored Jul 15, 2020
2 parents b79f767 + e727b8a commit 739300e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion scripts/buildsystems/vcpkg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,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)
Expand Down

0 comments on commit 739300e

Please sign in to comment.