From 3f73dcd7f34eb63a03630b85ed5fe83a47c3e5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 21 Apr 2023 07:09:01 +0800 Subject: [PATCH] [vcpkg] Move include ports.cmake after defining multiple macros (#29916) Co-authored-by: jyu49 Co-authored-by: Monica --- scripts/ports.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index c9bb4eda08..ac0b64e6eb 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -129,18 +129,18 @@ if(CMD STREQUAL "BUILD") include("${CMAKE_TRIPLET_FILE}") - if (DEFINED VCPKG_PORT_CONFIGS) - foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS) - include("${VCPKG_PORT_CONFIG}") - endforeach() - endif() - set(HOST_TRIPLET "${_HOST_TRIPLET}") set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location to install final packages for the host") set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + if (DEFINED VCPKG_PORT_CONFIGS) + foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS) + include("${VCPKG_PORT_CONFIG}") + endforeach() + endif() + set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt") file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}")