2 files changed, 10 insertions, 5 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg-general.xml b/scripts/buildsystems/msbuild/vcpkg-general.xml
index d45f1103f..2638597a6 100644
--- a/scripts/buildsystems/msbuild/vcpkg-general.xml
+++ b/scripts/buildsystems/msbuild/vcpkg-general.xml
@@ -41,7 +41,7 @@
                 Category="General"
                 Default="true">
   </BoolProperty>
-  <StringProperty Name="VcpkgUserTriplet"
+  <StringProperty Name="VcpkgTriplet"
                   DisplayName="Triplet"
                   Description="Specifies the triplet used by Vcpkg"
                   Category="General"
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index d0492262a..e27fd39f9 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -20,9 +20,17 @@
     <VcpkgOSTarget Condition="'$(VcpkgOSTarget)' == ''">windows</VcpkgOSTarget>
   </PropertyGroup>
 
+  <!-- Set default Platform Target-->
+  <PropertyGroup Condition="'$(Platform)' == 'Win32'">
+    <VcpkgPlatformTarget Condition="'$(VcpkgPlatformTarget)' == ''">x86</VcpkgPlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VcpkgPlatformTarget Condition="'$(VcpkgPlatformTarget)' == ''">$(Platform)</VcpkgPlatformTarget>
+  </PropertyGroup>
+
   <!-- Set other defaults-->
   <PropertyGroup Condition="'$(VcpkgHasProps)'!='true'" >
-    <VcpkgUserTriplet Condition="'$(VcpkgUserTriplet)' == ''">$(PlatformTarget)-$(VcpkgOSTarget)</VcpkgUserTriplet>
+    <VcpkgUserTriplet Condition="'$(VcpkgUserTriplet)' == ''">$(VcpkgPlatformTarget)-$(VcpkgOSTarget)</VcpkgUserTriplet>
     <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">$(VcpkgUserTriplet)</VcpkgTriplet>
     <VcpkgCurrentInstalledDir Condition="'$(VcpkgCurrentInstalledDir)' == ''">$(VcpkgRoot)\installed\$(VcpkgTriplet)\</VcpkgCurrentInstalledDir>
   </PropertyGroup>
@@ -46,9 +54,6 @@
   <PropertyGroup Condition="'$(VcpkgUseStatic)' == 'true'">
     <VcpkgTriplet>$(VcpkgUserTriplet)-static</VcpkgTriplet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(VcpkgUseStatic)' != 'true'">
-    <VcpkgTriplet>$(VcpkgUserTriplet)</VcpkgTriplet>
-  </PropertyGroup>
 
   <PropertyGroup Condition="'$(VcpkgCurrentInstalledDir)' == ''">
     <VcpkgCurrentInstalledDir>$(VcpkgInstalledDir)$(VcpkgTriplet)</VcpkgCurrentInstalledDir>