aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorStephane Lajoie <dada@typicus.org>2017-07-03 21:53:35 -0400
committerStephane Lajoie <dada@typicus.org>2017-07-03 21:53:35 -0400
commita2fc99fa3106f9cfe9cb810c89413ddd5f3a0d11 (patch)
treeb48b9b694d8d05ed86c403bedc69c8702a66c1e1 /docs
parent83c7bfc3cec78f82608581ef110ee550aae71234 (diff)
parent20eac6399951d1bd25af6e68fad093d2076038d4 (diff)
downloadvcpkg-a2fc99fa3106f9cfe9cb810c89413ddd5f3a0d11.tar.gz
vcpkg-a2fc99fa3106f9cfe9cb810c89413ddd5f3a0d11.zip
Merge branch 'master' into add-llvm
Diffstat (limited to 'docs')
-rw-r--r--docs/users/integration.md4
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>
```