Skip to content

Commit 41c447c

Browse files
authored
[libmultisense] [libmultisense6] Update libmultisense to v7.1.0 and add legacy libmultisense6 port (microsoft#45301)
1 parent d5b98c8 commit 41c447c

File tree

6 files changed

+59
-22
lines changed

6 files changed

+59
-22
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/source/LibMultiSense/MultiSenseConfig.cmake.in b/source/LibMultiSense/MultiSenseConfig.cmake.in
2+
index 99f4264..74ffff4 100644
3+
--- a/source/LibMultiSense/MultiSenseConfig.cmake.in
4+
+++ b/source/LibMultiSense/MultiSenseConfig.cmake.in
5+
@@ -1,5 +1,10 @@
6+
@PACKAGE_INIT@
7+
8+
+if (@BUILD_JSON_SERIALIZATION@)
9+
+ find_package(nlohmann_json CONFIG REQUIRED)
10+
+endif ()
11+
+
12+
+include("${CMAKE_CURRENT_LIST_DIR}/MultiSenseWireTargets.cmake")
13+
include("${CMAKE_CURRENT_LIST_DIR}/MultiSenseTargets.cmake")
14+
15+
check_required_components(MultiSense)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/source/LibMultiSense/details/legacy/message.cc b/source/LibMultiSense/details/legacy/message.cc
2+
index 14c2a6e..5c3aa23 100644
3+
--- a/source/LibMultiSense/details/legacy/message.cc
4+
+++ b/source/LibMultiSense/details/legacy/message.cc
5+
@@ -34,6 +34,7 @@
6+
* 2025-01-08, malvarado@carnegierobotics.com, IRAD, Created file.
7+
**/
8+
9+
+#include <algorithm>
10+
#include <inttypes.h>
11+
#include <limits>
12+

ports/libmultisense/portfile.cmake

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
if(VCPKG_TARGET_IS_WINDOWS)
2-
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
3-
endif()
4-
51
vcpkg_from_github(
62
OUT_SOURCE_PATH SOURCE_PATH
73
REPO carnegierobotics/LibMultiSense
84
REF ${VERSION}
9-
SHA512 354c9eec33e9153496b0858b8dc6e5735218585abecf885f356f643d833ebf00a63fc4571634283c430de07045f2be544b0e6d445599fce4c1655af671b758bd
5+
SHA512 4fb2343fc2288792c732e7e61cb447b953ed8e8354c3c1e401c5b2bc8151f4b3d8f692882e015e5e56d8dc2d08f121a798138a6974d3b02348b1689c9015fe00
106
HEAD_REF master
7+
PATCHES
8+
fix-missing-algorithm.patch
9+
fix-find-package-config-file.patch
1110
)
1211

1312
vcpkg_check_features(
14-
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
15-
FEATURES
16-
utilities MULTISENSE_BUILD_UTILITIES
13+
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
14+
FEATURES
15+
json-serialization BUILD_JSON_SERIALIZATION
16+
opencv BUILD_OPENCV
17+
utilities MULTISENSE_BUILD_UTILITIES
1718
)
1819
vcpkg_cmake_configure(
1920
SOURCE_PATH "${SOURCE_PATH}"
2021
OPTIONS
22+
-DBUILD_LEGACY_API=OFF
2123
${FEATURE_OPTIONS}
2224
)
2325

@@ -34,19 +36,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
3436
if ("utilities" IN_LIST FEATURES)
3537
vcpkg_copy_tools(
3638
TOOL_NAMES
37-
AprilTagTestUtility
38-
ChangeFps
3939
ChangeIpUtility
40-
ChangeResolution
41-
ChangeTransmitDelay
42-
ColorImageUtility
43-
DeviceInfoUtility
44-
ExternalCalUtility
45-
FlashUtility
4640
ImageCalUtility
47-
ImuConfigUtility
48-
ImuTestUtility
49-
LidarCalUtility
5041
PointCloudUtility
5142
RectifiedFocalLengthUtility
5243
SaveImageUtility

ports/libmultisense/vcpkg.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"name": "libmultisense",
3-
"version": "6.1.0",
3+
"version": "7.1.0",
44
"description": "A C++ library for interfacing with the MultiSense S family of sensors from Carnegie Robotics.",
55
"homepage": "https://github.com/carnegierobotics/LibMultiSense",
6-
"supports": "linux | (windows & !static)",
76
"dependencies": [
87
{
98
"name": "vcpkg-cmake",
@@ -15,6 +14,21 @@
1514
}
1615
],
1716
"features": {
17+
"json-serialization": {
18+
"description": "Build JSON type serialization helpers.",
19+
"dependencies": [
20+
{
21+
"name": "nlohmann-json",
22+
"version>=": "3.10.2"
23+
}
24+
]
25+
},
26+
"opencv": {
27+
"description": "Build OpenCV helpers.",
28+
"dependencies": [
29+
"opencv"
30+
]
31+
},
1832
"utilities": {
1933
"description": "Build MultiSense utility applications."
2034
}

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4977,7 +4977,7 @@
49774977
"port-version": 0
49784978
},
49794979
"libmultisense": {
4980-
"baseline": "6.1.0",
4980+
"baseline": "7.1.0",
49814981
"port-version": 0
49824982
},
49834983
"libmupdf": {

versions/l-/libmultisense.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "3d9ad2b386e8089ebfc19a99195434e4cf56809e",
5+
"version": "7.1.0",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "720294982a8079963638f6ccb9a5292541f63e82",
510
"version": "6.1.0",

0 commit comments

Comments
 (0)