From b30734e9101c161e442ffb805633f6cfadbc57aa Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 10 Mar 2025 11:03:21 -0700 Subject: [PATCH] Allow vcpkg.exe to set CURRENT_ variables. (#44217) --- scripts/ports.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 026555e41b..0ff66379e1 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -124,8 +124,15 @@ file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR) set(CURRENT_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}" CACHE PATH "Location to install final packages") -if(PORT) +if(DEFINED CURRENT_BUILDTREES_DIR) + file(TO_CMAKE_PATH "${CURRENT_BUILDTREES_DIR}" CURRENT_BUILDTREES_DIR) +elseif(PORT) set(CURRENT_BUILDTREES_DIR "${BUILDTREES_DIR}/${PORT}") +endif() + +if(DEFINED CURRENT_PACKAGES_DIR) + file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" CURRENT_PACKAGES_DIR) +elseif(PORT) set(CURRENT_PACKAGES_DIR "${PACKAGES_DIR}/${PORT}_${TARGET_TRIPLET}") endif()