diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
| commit | 7a67785e14130170679d19be832f2e1ba2530560 (patch) | |
| tree | 49196cc5252f2e800a18802548006977da276447 /docs/users/integration.md | |
| parent | 524a1414fc395fdc60951d63f4a66683309fd630 (diff) | |
| parent | b2996e1fd48842446a64443d057c576f819bda00 (diff) | |
| download | vcpkg-7a67785e14130170679d19be832f2e1ba2530560.tar.gz vcpkg-7a67785e14130170679d19be832f2e1ba2530560.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/roschuma/4988
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() |
