diff options
| author | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
|---|---|---|
| committer | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
| commit | b3caf67749f21952e0157ba77ece755aa01b254a (patch) | |
| tree | dff6a178b506fdc58e28bbc9094f1687eb99bd72 /scripts | |
| parent | fddebb75da034752fb267ba121497ba58157bb79 (diff) | |
| parent | 618fa203c13c30bd19826988cff66481bca0562f (diff) | |
| download | vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.tar.gz vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.zip | |
Merge branch 'trunk' into parallel-file-ops
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get_triplet_environment.cmake | 4 | ||||
| -rw-r--r-- | scripts/ports.cmake | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake index bc79b16ce..21464bb2e 100644 --- a/scripts/get_triplet_environment.cmake +++ b/scripts/get_triplet_environment.cmake @@ -1,4 +1,7 @@ include(${CMAKE_TRIPLET_FILE}) +if (DEFINED CMAKE_ENV_OVERRIDES_FILE) + include(${CMAKE_ENV_OVERRIDES_FILE} OPTIONAL) +endif() # GUID used as a flag - "cut here line" message("c35112b6-d1ba-415b-aa5d-81de856ef8eb") @@ -9,3 +12,4 @@ message("VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}") message("VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}") message("VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") message("VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}") +message("VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH}") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 860d08893..58510567b 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -67,6 +67,7 @@ if(CMD MATCHES "^BUILD$") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) include(${CMAKE_TRIPLET_FILE}) + include(${ENV_OVERRIDES_FILE} OPTIONAL) set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE}) include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_functions.cmake) |