From 642a932778c3ea64c5e36c6b5fa352e436407a1b Mon Sep 17 00:00:00 2001 From: Manuel Kugelmann Date: Thu, 2 Apr 2020 20:10:22 +0200 Subject: [PATCH 1/3] Fix [boost] find_package for MSVC2013 / v120 added conditional set(Boost_COMPILER "-vc120") to vcpkg.cmake --- 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 1eebc3b8db5e83..0631ae4fdf00e4 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -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) From d47b4993d86faaf777c3ebd2d2556cb4e884f3a1 Mon Sep 17 00:00:00 2001 From: Manuel Kugelmann Date: Sun, 14 Jun 2020 00:28:08 +0200 Subject: [PATCH 2/3] fixed spacing --- scripts/buildsystems/vcpkg.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 0631ae4fdf00e4..66928ceb370292 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -247,10 +247,10 @@ macro(${VCPKG_OVERRIDE_FIND_PACKAGE_NAME} name) set(Boost_NO_BOOST_CMAKE ON) unset(Boost_USE_STATIC_RUNTIME CACHE) if("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v120") - set(Boost_COMPILER "-vc120") - else() - set(Boost_COMPILER "-vc140") - endif() + 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) From e727b8a35ed0e251d48055b219e7cd610b412ad3 Mon Sep 17 00:00:00 2001 From: Manuel Kugelmann Date: Sun, 14 Jun 2020 00:29:43 +0200 Subject: [PATCH 3/3] fixed spaces --- scripts/buildsystems/vcpkg.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 66928ceb370292..b94a89878ec680 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -247,10 +247,10 @@ macro(${VCPKG_OVERRIDE_FIND_PACKAGE_NAME} name) set(Boost_NO_BOOST_CMAKE ON) unset(Boost_USE_STATIC_RUNTIME CACHE) if("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v120") - set(Boost_COMPILER "-vc120") - else() - set(Boost_COMPILER "-vc140") - endif() + 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)