diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-07-19 08:08:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 08:08:08 -0700 |
| commit | 18c849daea115310d7ee985e5af99ba96e6b79fe (patch) | |
| tree | e8fdf76fe31cd299c84a1e16877aa217c9bab9d5 /scripts | |
| parent | e81d22ddec6887a497055d4804a004ca662b4526 (diff) | |
| parent | 618fa203c13c30bd19826988cff66481bca0562f (diff) | |
| download | vcpkg-18c849daea115310d7ee985e5af99ba96e6b79fe.tar.gz vcpkg-18c849daea115310d7ee985e5af99ba96e6b79fe.zip | |
Merge branch 'master' into external_file_abi
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get_triplet_environment.cmake | 4 | ||||
| -rw-r--r-- | scripts/ports.cmake | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake index ab5e8f8c3..45bbe0df4 100644 --- a/scripts/get_triplet_environment.cmake +++ b/scripts/get_triplet_environment.cmake @@ -1,6 +1,6 @@ include(${CMAKE_TRIPLET_FILE}) -if (DEFINED CMAKE_PORT_SETTINGS) - include(${CMAKE_PORT_SETTINGS} OPTIONAL) +if (DEFINED CMAKE_ENV_OVERRIDES_FILE) + include(${CMAKE_ENV_OVERRIDES_FILE} OPTIONAL) endif() # GUID used as a flag - "cut here line" diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 0c33fdffc..86b2719d5 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -67,7 +67,8 @@ if(CMD MATCHES "^BUILD$") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) include(${CMAKE_TRIPLET_FILE}) - include(${CMAKE_PORT_SETTINGS} OPTIONAL) + 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) |