diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 02:30:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 02:30:59 -0700 |
| commit | 0e000644053015b7f7a0985e14f0bd384c847d17 (patch) | |
| tree | 7e456fd12b3bf281b28587338f1650017c8b32ab /docs/users | |
| parent | 93ce6b4f27602cd18f4327c2cfd84093d472b8bb (diff) | |
| parent | 39ba5b2b30c9f7b49e777a62093cdd49d05b53a9 (diff) | |
| download | vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.tar.gz vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.zip | |
Merge branch 'master' into master
Diffstat (limited to 'docs/users')
| -rw-r--r-- | docs/users/config-environment.md | 7 | ||||
| -rw-r--r-- | docs/users/integration.md | 2 | ||||
| -rw-r--r-- | docs/users/triplets.md | 7 |
3 files changed, 15 insertions, 1 deletions
diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index f25df89a3..bffa07278 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -40,3 +40,10 @@ This environment variable can be set to a triplet name which will be used for un #### VCPKG_FORCE_SYSTEM_BINARIES
This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries.
+
+### VCPKG_KEEP_ENV_VARS
+
+This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to
+the build environment.
+
+Example: `FOO_SDK_DIR;BAR_SDK_DIR`
diff --git a/docs/users/integration.md b/docs/users/integration.md index 6d56c7c70..cd5f61e9d 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -139,7 +139,7 @@ You can set `VCPKG_TARGET_TRIPLET` on the configure line: ```no-highlight cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... ``` -If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to contoll the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): +If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to control the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): ```cmake if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 87fa72fd3..7b75956e8 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -33,6 +33,13 @@ Valid options include any CMake system name, such as: - `Darwin` (Mac OSX) - `Linux` (Linux) +### VCPKG_CMAKE_SYSTEM_VERSION +Specifies the target platform system version. + +This field is optional and, if present, will be passed into the build as `CMAKE_SYSTEM_VERSION`. + +See also the CMake documentation for `CMAKE_SYSTEM_VERSION`: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html. + ### VCPKG_CHAINLOAD_TOOLCHAIN_FILE Specifies an alternate CMake Toolchain file to use. |