diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-21 00:36:36 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-21 00:36:36 -0800 |
| commit | 09c3cc0d88562083949357e1499130e68c5706c5 (patch) | |
| tree | c848583011035ab21b43f523b23533055a017723 /docs | |
| parent | 0d1229d34babdc9c8fbfe2e1b43b38e657519093 (diff) | |
| parent | 4afe20fc123d794cd066d1dc19b8873b3a2a3645 (diff) | |
| download | vcpkg-09c3cc0d88562083949357e1499130e68c5706c5.tar.gz vcpkg-09c3cc0d88562083949357e1499130e68c5706c5.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4990
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() |