diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-28 09:19:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 09:19:16 -0700 |
| commit | d35dfff48338cc180cf79fca56cea129d4018ad8 (patch) | |
| tree | dbdd6b5a6d89ae4e242d2e7d2082500cd9f4dadd /scripts | |
| parent | 6c22dbea97bd708172ae977c17c2dce202ce5b8c (diff) | |
| parent | 4a5ce3165dcd0769c55a53151c145a3d3df9d9ef (diff) | |
| download | vcpkg-d35dfff48338cc180cf79fca56cea129d4018ad8.tar.gz vcpkg-d35dfff48338cc180cf79fca56cea129d4018ad8.zip | |
Merge pull request #1563 from paercebal/triplet_system_arch_correction
fix the TRIPLET_SYSTEM_ARCH initialization
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ports.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 1d699a966..8b4d17d80 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -32,8 +32,6 @@ endif() if(CMD MATCHES "^BUILD$") - string(REGEX REPLACE "([^-]*)-([^-]*)" "\\1" TRIPLET_SYSTEM_ARCH ${TARGET_TRIPLET}) - set(CMAKE_TRIPLET_FILE ${VCPKG_ROOT_DIR}/triplets/${TARGET_TRIPLET}.cmake) if(NOT EXISTS ${CMAKE_TRIPLET_FILE}) message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}") @@ -70,6 +68,7 @@ if(CMD MATCHES "^BUILD$") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) include(${CMAKE_TRIPLET_FILE}) + set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE}) include(${CURRENT_PORT_DIR}/portfile.cmake) set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO) |