mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:01:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix vs2019 arch specification

Browse Source
This commit is contained in:
kiwixz 2019-03-16 17:53:31 +01:00
parent b755c30bc7
commit caa7981dcf
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -110,9 +110,18 @@ function(vcpkg_configure_cmake)
set(GENERATOR "Visual Studio 15 2017")
set(ARCH "ARM64")
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "${VCPKG_TARGET_ARCHITECTURE}")
set(ARCH "Win32")
elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "x64")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "ARM")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v142")
set(GENERATOR "Visual Studio 16 2019")
set(ARCH "ARM64")
else()
if(NOT VCPKG_CMAKE_SYSTEM_NAME)