From 040dfddfd31616841dc095e194250737a1193b53 Mon Sep 17 00:00:00 2001 From: talregev Date: Mon, 7 Apr 2025 22:33:34 +0300 Subject: [PATCH] [gz-msgs] Fix the port to allow caching of binary files in tools (#44857) --- ports/gz-msgs/portfile.cmake | 4 +++- ports/gz-msgs/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gz-msgs.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/gz-msgs/portfile.cmake b/ports/gz-msgs/portfile.cmake index ece56e9335..a7fbfedf8a 100644 --- a/ports/gz-msgs/portfile.cmake +++ b/ports/gz-msgs/portfile.cmake @@ -23,7 +23,7 @@ ignition_modular_library( ) file(GLOB BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/${PORT}${VERSION_MAJOR}_*") -file(COPY ${BIN_FILES} DESTINATION ${CURRENT_INSTALLED_DIR}/tools/${PORT}${VERSION_MAJOR}) +file(COPY ${BIN_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}${VERSION_MAJOR}) file(REMOVE_RECURSE ${BIN_FILES}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) @@ -34,3 +34,5 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}${VERSION_MAJOR}") diff --git a/ports/gz-msgs/vcpkg.json b/ports/gz-msgs/vcpkg.json index 91515994bd..63826b847a 100644 --- a/ports/gz-msgs/vcpkg.json +++ b/ports/gz-msgs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-msgs", "version": "11.0.2", + "port-version": 1, "description": "Middleware protobuf messages for robotics", "license": "Apache-2.0", "supports": "!(android | arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 114724d3be..0c59a42bd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3454,7 +3454,7 @@ }, "gz-msgs": { "baseline": "11.0.2", - "port-version": 0 + "port-version": 1 }, "gz-msgs9": { "baseline": "9.5.0", diff --git a/versions/g-/gz-msgs.json b/versions/g-/gz-msgs.json index 1a7f5f5e16..0a299f546c 100644 --- a/versions/g-/gz-msgs.json +++ b/versions/g-/gz-msgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f150b11ced24c5a927e7c646226e1e560d620a6", + "version": "11.0.2", + "port-version": 1 + }, { "git-tree": "6403c9d8c36bb22e31b70805fc0b47feae67f12f", "version": "11.0.2",