From bf6e201672c4e055f5958a5a485efcb838d155d6 Mon Sep 17 00:00:00 2001 From: "Ethan J. Musser" Date: Fri, 12 Jun 2026 19:02:10 -0400 Subject: [PATCH] [libmultisense] Update to `v7.9.0` (#52361) --- ports/libmultisense/portfile.cmake | 10 +++++++++- ports/libmultisense/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmultisense.json | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/libmultisense/portfile.cmake b/ports/libmultisense/portfile.cmake index 2e79a1ddac..31c5958120 100644 --- a/ports/libmultisense/portfile.cmake +++ b/ports/libmultisense/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO carnegierobotics/LibMultiSense REF ${VERSION} - SHA512 71c779cc0f23818aaab4cbba0a5aa5b3ad979180247a3d76b0f8fd5a3b7ced106520fa5df69946cd84510211b6508f5df80b09aecbbabb6601fee5f38ec79bc7 + SHA512 3f1278a2996517a6ca3c1baed765499365ab1bfd7a15e229e3d5babc7ee41c99b804a69d9e1f9ee9f3e075e01fd9624c04e98e3fad2f7b6b10c8986bd2bbe5a3 HEAD_REF master PATCHES 0000-disable-error-on-warning.patch @@ -39,6 +39,11 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# LibMultiSense installs additional CMake helper modules alongside `MultiSenseConfig.cmake`. +# `vcpkg_cmake_config_fixup()` only removes debug-side `*Config`/`*Targets` files, which leaves +# `${CURRENT_PACKAGES_DIR}/debug/share/MultiSense` populated and triggers a post-build policy error. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + if ("utilities" IN_LIST FEATURES) set(_tool_names ChangeIpUtility @@ -53,6 +58,9 @@ if ("utilities" IN_LIST FEATURES) if ("json-serialization" IN_LIST FEATURES) list(APPEND _tool_names DeviceInfoUtility) endif () + if ("opencv" IN_LIST FEATURES) + list(APPEND _tool_names FeatureDetectorUtility) + endif () vcpkg_copy_tools( TOOL_NAMES ${_tool_names} AUTO_CLEAN diff --git a/ports/libmultisense/vcpkg.json b/ports/libmultisense/vcpkg.json index b2603e1aad..959f61bf3b 100644 --- a/ports/libmultisense/vcpkg.json +++ b/ports/libmultisense/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmultisense", - "version": "7.6.0", + "version": "7.9.0", "description": "A C++ library for interfacing with the MultiSense S family of sensors from Carnegie Robotics.", "homepage": "https://github.com/carnegierobotics/LibMultiSense", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 45d72471e8..2a08f61ad3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5353,7 +5353,7 @@ "port-version": 1 }, "libmultisense": { - "baseline": "7.6.0", + "baseline": "7.9.0", "port-version": 0 }, "libmupdf": { diff --git a/versions/l-/libmultisense.json b/versions/l-/libmultisense.json index 46107d8dea..666b3c3297 100644 --- a/versions/l-/libmultisense.json +++ b/versions/l-/libmultisense.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffa516c573b9bce9dcf3baa32cb7bb29fc892104", + "version": "7.9.0", + "port-version": 0 + }, { "git-tree": "88faa7763bbf94f2670b23f179e1a8a840965582", "version": "7.6.0",