diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-20 13:50:12 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-20 13:50:12 -0800 |
| commit | ea831f43024a06700a9d8e901c1cb87844a63d81 (patch) | |
| tree | fd1a423c0f13fda818445d069a73453746d1d9f9 /docs/users/integration.md | |
| parent | 96b282341fd80763ef8533ba6619064ad3e8a60f (diff) | |
| parent | edec46528d897c584ab1d9454b36a58f7fece217 (diff) | |
| download | vcpkg-ea831f43024a06700a9d8e901c1cb87844a63d81.tar.gz vcpkg-ea831f43024a06700a9d8e901c1cb87844a63d81.zip | |
Merge branch 'master' into dev/philc/4966
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 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() |
