diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-20 14:56:52 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-20 14:56:52 -0800 |
| commit | 93ac00106ecc7409dab32366758c75baa9c9bb6a (patch) | |
| tree | 4681a5fd088ab04ce6fb11a1334e163576d698a7 /docs | |
| parent | f64362201923a20111ced9b789286437a8acac13 (diff) | |
| parent | 99b06bba5d86a6982f2491d9f4ea7ef637ff3747 (diff) | |
| download | vcpkg-93ac00106ecc7409dab32366758c75baa9c9bb6a.tar.gz vcpkg-93ac00106ecc7409dab32366758c75baa9c9bb6a.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4994
Diffstat (limited to 'docs')
| -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 fbaea41d9..10f5574c1 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -50,7 +50,7 @@ The `CMAKE_TOOLCHAIN_FILE` setting simply must be set before the `project()` dir ```cmake if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") endif() |