diff options
| author | Curtis.Bezault <curtbezault@gmail.com> | 2019-07-23 15:29:49 -0700 |
|---|---|---|
| committer | Curtis.Bezault <curtbezault@gmail.com> | 2019-07-23 15:29:49 -0700 |
| commit | 62ec13ba36146f01bfaccbfd5ad22141d6cb061b (patch) | |
| tree | be0099257bca99ea991b599acaa5afb541ce1fd0 /scripts | |
| parent | 2f2a45595fa925edeace250b694d70095c42b5fa (diff) | |
| parent | 3b808a48ce2fafab82bd7b53642a11a08b21c481 (diff) | |
| download | vcpkg-62ec13ba36146f01bfaccbfd5ad22141d6cb061b.tar.gz vcpkg-62ec13ba36146f01bfaccbfd5ad22141d6cb061b.zip | |
Merge build.cpp
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 fa1e5cb39..8ae365812 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) |