From 6b2b4efa7d750ece0b778817806663a5cb4c6c8f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 1 Nov 2024 20:09:51 -0700 Subject: [PATCH 1/2] Add CMake integration for --overlay-port-dirs. --- scripts/buildsystems/vcpkg.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index de8425ea6e53bb..7a2946d7cb2834 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -109,6 +109,7 @@ Install the dependencies listed in your manifest: if(VCPKG_MANIFEST_INSTALL) set(VCPKG_BOOTSTRAP_OPTIONS "${VCPKG_BOOTSTRAP_OPTIONS}" CACHE STRING "Additional options to bootstrap vcpkg" FORCE) + set(VCPKG_OVERLAY_PORT_DIRS "${VCPKG_OVERLAY_PORT_DIRS}" CACHE STRING "Overlay port directories to use for vcpkg install in manifest mode" FORCE) set(VCPKG_OVERLAY_PORTS "${VCPKG_OVERLAY_PORTS}" CACHE STRING "Overlay ports to use for vcpkg install in manifest mode" FORCE) set(VCPKG_OVERLAY_TRIPLETS "${VCPKG_OVERLAY_TRIPLETS}" CACHE STRING "Overlay triplets to use for vcpkg install in manifest mode" FORCE) set(VCPKG_INSTALL_OPTIONS "${VCPKG_INSTALL_OPTIONS}" CACHE STRING "Additional install options to pass to vcpkg" FORCE) @@ -491,6 +492,11 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--host-triplet=${VCPKG_HOST_TRIPLET}") endif() + if(VCPKG_OVERLAY_PORT_DIRS) + foreach(Z_VCPKG_OVERLAY_PORT_DIR IN LISTS VCPKG_OVERLAY_PORT_DIRS) + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-port-dir=${Z_VCPKG_OVERLAY_PORT_DIR}") + endforeach() + endif() if(VCPKG_OVERLAY_PORTS) foreach(Z_VCPKG_OVERLAY_PORT IN LISTS VCPKG_OVERLAY_PORTS) list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-ports=${Z_VCPKG_OVERLAY_PORT}") From 636f700743a139718edfd5ea0443f561db0cb671 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 7 Nov 2024 13:13:37 -0800 Subject: [PATCH 2/2] Update scripts/buildsystems/vcpkg.cmake Co-authored-by: Kai Pastor --- scripts/buildsystems/vcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 7a2946d7cb2834..c3265cb8941919 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -494,7 +494,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C if(VCPKG_OVERLAY_PORT_DIRS) foreach(Z_VCPKG_OVERLAY_PORT_DIR IN LISTS VCPKG_OVERLAY_PORT_DIRS) - list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-port-dir=${Z_VCPKG_OVERLAY_PORT_DIR}") + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-port-dirs=${Z_VCPKG_OVERLAY_PORT_DIR}") endforeach() endif() if(VCPKG_OVERLAY_PORTS)