diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-03-12 11:29:31 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-03-12 11:29:31 -0700 |
| commit | b29b874ae9007a4450b736cabbf3cd94a4ec6359 (patch) | |
| tree | 09a031509ccb697d20dc0745bae6541bb694a2b0 /docs/users/integration.md | |
| parent | fe626490f0f3537fc85f47f76d5bcd16ea539dea (diff) | |
| parent | f24bd414ceeed5f4faad80405b87da4394c02d63 (diff) | |
| download | vcpkg-b29b874ae9007a4450b736cabbf3cd94a4ec6359.tar.gz vcpkg-b29b874ae9007a4450b736cabbf3cd94a4ec6359.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5580
Diffstat (limited to 'docs/users/integration.md')
| -rw-r--r-- | docs/users/integration.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/users/integration.md b/docs/users/integration.md index 6d56c7c70..cd5f61e9d 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -139,7 +139,7 @@ You can set `VCPKG_TARGET_TRIPLET` on the configure line: ```no-highlight cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... ``` -If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to contoll the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): +If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to control the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): ```cmake if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) |