aboutsummaryrefslogtreecommitdiff
path: root/docs/users
diff options
context:
space:
mode:
authorBob Kast <bob.kast@emc.com>2018-11-13 15:48:26 -0500
committerBob Kast <bob.kast@emc.com>2018-11-13 15:48:26 -0500
commitd9e39bb4056795a70028b228a746da4889ca7c15 (patch)
tree4853304e1e71e45becedfba5d83e3f5321e0b9c9 /docs/users
parent1a9dadf855ab93ff0803fd1ce4ecceec5bf211f0 (diff)
parentffa114aaa43e8bcdf880d6e2c47ee0ed46125070 (diff)
downloadvcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.tar.gz
vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.zip
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts: # ports/ecsutil/CONTROL # ports/ecsutil/portfile.cmake
Diffstat (limited to 'docs/users')
-rw-r--r--docs/users/triplets.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/users/triplets.md b/docs/users/triplets.md
index d547725ea..2bb9c74b3 100644
--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@@ -62,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`