diff options
| author | Daniel Shaw <t-dansha@microsoft.com> | 2017-07-14 13:22:09 -0700 |
|---|---|---|
| committer | Daniel Shaw <t-dansha@microsoft.com> | 2017-07-14 13:22:09 -0700 |
| commit | 4f7f1cf5d159f69af5f10925245799dc91af7968 (patch) | |
| tree | 9495a6abfe8494d8276dadef6c160e88d35128f1 /docs | |
| parent | 336e25218a73f9b54120e3c35b3d28e6426deeb1 (diff) | |
| parent | 2055a9cd4490861aa7ce9e1af23c0232f97552c9 (diff) | |
| download | vcpkg-4f7f1cf5d159f69af5f10925245799dc91af7968.tar.gz vcpkg-4f7f1cf5d159f69af5f10925245799dc91af7968.zip | |
Merge remote-tracking branch 'origin' into create_install_tests
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/users/integration.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/users/integration.md b/docs/users/integration.md index 1e52adb88..f1b5014bf 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -107,8 +107,8 @@ To override the automatically chosen [triplet][], you can specify the MSBuild pr ```xml <PropertyGroup Label="Globals"> <!-- .... --> - <VcpkgTriplet Condition="'$(Configuration)'=='Win32'">x86-windows-static</VcpkgTriplet> - <VcpkgTriplet Condition="'$(Configuration)'=='x64'">x64-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> </PropertyGroup> ``` |