aboutsummaryrefslogtreecommitdiff
path: root/docs/users/triplets.md
diff options
context:
space:
mode:
authorBob Kast <bob.kast@emc.com>2018-10-23 09:06:58 -0400
committerBob Kast <bob.kast@emc.com>2018-10-23 09:06:58 -0400
commit230d795ae3c3f2e45821b887c6065a81a8c04326 (patch)
tree7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /docs/users/triplets.md
parent3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff)
parent9b21ff9612916e24f89c6839599d3d50446597d8 (diff)
downloadvcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz
vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts: # ports/ecsutil/CONTROL # ports/ecsutil/portfile.cmake
Diffstat (limited to 'docs/users/triplets.md')
-rw-r--r--docs/users/triplets.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/users/triplets.md b/docs/users/triplets.md
index 70580df46..2bb9c74b3 100644
--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@@ -41,6 +41,16 @@ This can be set to `v141`, `v140`, or left blank. If left blank, we select the l
Visual Studio 2015 platform toolset is `v140`
Visual Studio 2017 platform toolset is `v141`
+### VCPKG_VISUAL_STUDIO_PATH
+Specifies the Visual Studio installation to use.
+
+When unspecified, a Visual Studio instance is selected automatically, preferring Stable 2017, then Preview 2017, then 2015.
+
+The path should be absolute, formatted with backslashes, and have no trailing slash:
+```cmake
+set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community")
+```
+
### VCPKG_CHAINLOAD_TOOLCHAIN_FILE
Specifies an alternate CMake Toolchain file to use.
@@ -52,6 +62,7 @@ See also the CMake documentation for toolchain files: https://cmake.org/cmake/he
Sets additional compiler flags to be used when not using `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`.
This option also has forms for configuration-specific and C flags:
+- `VCPKG_CXX_FLAGS`
- `VCPKG_CXX_FLAGS_DEBUG`
- `VCPKG_CXX_FLAGS_RELEASE`
- `VCPKG_C_FLAGS`