diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-27 17:55:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 17:55:07 -0700 |
| commit | db2bc7ed80cd85935bcf80a02a06c796d01197b7 (patch) | |
| tree | dbc3bee79e5f0b6fcb2e673278737088ab183bca | |
| parent | 13d6e660a30d59a598d43d97d9d905e3cc2fdb6d (diff) | |
| parent | 1e7a54222bc5b23dc30b9e228853d23279cfa75c (diff) | |
| download | vcpkg-db2bc7ed80cd85935bcf80a02a06c796d01197b7.tar.gz vcpkg-db2bc7ed80cd85935bcf80a02a06c796d01197b7.zip | |
Merge pull request #999 from eco/open-folder-doc
Fixes for CMAKE_TOOLCHAIN_FILE example
| -rw-r--r-- | docs/EXAMPLES.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/EXAMPLES.md b/docs/EXAMPLES.md index 2463d321f..0d58b17d7 100644 --- a/docs/EXAMPLES.md +++ b/docs/EXAMPLES.md @@ -101,7 +101,7 @@ To remove the integration for your user, you can use `.\vcpkg integrate remove`. The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. -Alternatively, if you are using CMake through Open Folder with Visual Studio 2017 you can define `CMAKE_TOOLCHAIN_FILE` by adding a `variables` section to your `CMakeSettings.json` configurations: +Alternatively, if you are using CMake through Open Folder with Visual Studio 2017 you can define `CMAKE_TOOLCHAIN_FILE` by adding a `variables` section to each of your `CMakeSettings.json` configurations: ```json { @@ -112,15 +112,14 @@ Alternatively, if you are using CMake through Open Folder with Visual Studio 201 "configurationType" : "Debug", "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", "cmakeCommandArgs": "", - "buildCommandArgs": "-m -v:minimal" + "buildCommandArgs": "-m -v:minimal", "variables": [ { "name": "CMAKE_TOOLCHAIN_FILE", "value": "D:\\src\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" } ] - }, - // also add it to the other configurations... + } ] } ``` |
