fix vs2019 arch specification

fealebenpae · Mar 16, 2019 · caa7981 · caa7981
1 parent b755c30
commit caa7981
Showing 1 changed file with 11 additions and 2 deletions.
diff --git 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)