diff options
| author | kiwixz <kiwixz@outlook.com> | 2019-03-16 17:53:31 +0100 |
|---|---|---|
| committer | kiwixz <kiwixz@outlook.com> | 2019-03-16 17:53:31 +0100 |
| commit | caa7981dcfbdc2da76335d82920bb781f7b047d6 (patch) | |
| tree | a28063a8ca314848914dd4c4a3932865011f28ba /scripts | |
| parent | b755c30bc7f4a48db344eb1a25873e56b31925c0 (diff) | |
| download | vcpkg-caa7981dcfbdc2da76335d82920bb781f7b047d6.tar.gz vcpkg-caa7981dcfbdc2da76335d82920bb781f7b047d6.zip | |
fix vs2019 arch specification
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 83acf1bae..ceff199ab 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -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) |