diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-16 13:51:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 13:51:22 -0700 |
| commit | b47ca1b01267624f908ac82b9f03ef7d941a6a11 (patch) | |
| tree | 57a138d3965cbc04e19d9a7b16d51f8d173af065 /scripts | |
| parent | dd8e95af87949680f19289a6b3ac6882bf139c54 (diff) | |
| parent | c605f4eea632878dc495fd280a41734bd14e851f (diff) | |
| download | vcpkg-b47ca1b01267624f908ac82b9f03ef7d941a6a11.tar.gz vcpkg-b47ca1b01267624f908ac82b9f03ef7d941a6a11.zip | |
Merge pull request #7305 from cbezault/external_file_abi
[vcpkg] Public ABI override option
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get_triplet_environment.cmake | 1 | ||||
| -rw-r--r-- | scripts/ports.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake index 21464bb2e..0457cee9b 100644 --- a/scripts/get_triplet_environment.cmake +++ b/scripts/get_triplet_environment.cmake @@ -13,3 +13,4 @@ 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}") +message("VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE}") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 58510567b..86b2719d5 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -68,6 +68,7 @@ if(CMD MATCHES "^BUILD$") 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) |