diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-07-19 08:01:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 08:01:38 -0700 |
| commit | 618fa203c13c30bd19826988cff66481bca0562f (patch) | |
| tree | 3a5c8b388d72beaa82a20fe317a363de209bec41 /scripts | |
| parent | cf9820bb86565fc21b68890749c8954c9cff1778 (diff) | |
| download | vcpkg-618fa203c13c30bd19826988cff66481bca0562f.tar.gz vcpkg-618fa203c13c30bd19826988cff66481bca0562f.zip | |
[vcpkg] Portfile Settings (#7292)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get_triplet_environment.cmake | 3 | ||||
| -rw-r--r-- | scripts/ports.cmake | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake index 24ff40905..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") 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) |