File tree Expand file tree Collapse file tree 6 files changed +59
-22
lines changed Expand file tree Collapse file tree 6 files changed +59
-22
lines changed Original file line number Diff line number Diff line change
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)
Original file line number Diff line number Diff line change
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,
[email protected] , IRAD, Created file.
7
+ **/
8
+
9
+ + #include <algorithm>
10
+ #include <inttypes.h>
11
+ #include <limits>
12
+
Original file line number Diff line number Diff line change 1
- if (VCPKG_TARGET_IS_WINDOWS)
2
- vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
3
- endif ()
4
-
5
1
vcpkg_from_github(
6
2
OUT_SOURCE_PATH SOURCE_PATH
7
3
REPO carnegierobotics/LibMultiSense
8
4
REF ${VERSION}
9
- SHA512 354c9eec33e9153496b0858b8dc6e5735218585abecf885f356f643d833ebf00a63fc4571634283c430de07045f2be544b0e6d445599fce4c1655af671b758bd
5
+ SHA512 4fb2343fc2288792c732e7e61cb447b953ed8e8354c3c1e401c5b2bc8151f4b3d8f692882e015e5e56d8dc2d08f121a798138a6974d3b02348b1689c9015fe00
10
6
HEAD_REF master
7
+ PATCHES
8
+ fix-missing-algorithm.patch
9
+ fix-find -package-config-file.patch
11
10
)
12
11
13
12
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
17
18
)
18
19
vcpkg_cmake_configure(
19
20
SOURCE_PATH "${SOURCE_PATH} "
20
21
OPTIONS
22
+ -DBUILD_LEGACY_API=OFF
21
23
${FEATURE_OPTIONS}
22
24
)
23
25
@@ -34,19 +36,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
34
36
if ("utilities" IN_LIST FEATURES)
35
37
vcpkg_copy_tools(
36
38
TOOL_NAMES
37
- AprilTagTestUtility
38
- ChangeFps
39
39
ChangeIpUtility
40
- ChangeResolution
41
- ChangeTransmitDelay
42
- ColorImageUtility
43
- DeviceInfoUtility
44
- ExternalCalUtility
45
- FlashUtility
46
40
ImageCalUtility
47
- ImuConfigUtility
48
- ImuTestUtility
49
- LidarCalUtility
50
41
PointCloudUtility
51
42
RectifiedFocalLengthUtility
52
43
SaveImageUtility
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " libmultisense" ,
3
- "version" : " 6 .1.0" ,
3
+ "version" : " 7 .1.0" ,
4
4
"description" : " A C++ library for interfacing with the MultiSense S family of sensors from Carnegie Robotics." ,
5
5
"homepage" : " https://github.com/carnegierobotics/LibMultiSense" ,
6
- "supports" : " linux | (windows & !static)" ,
7
6
"dependencies" : [
8
7
{
9
8
"name" : " vcpkg-cmake" ,
15
14
}
16
15
],
17
16
"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
+ },
18
32
"utilities" : {
19
33
"description" : " Build MultiSense utility applications."
20
34
}
Original file line number Diff line number Diff line change 4977
4977
"port-version" : 0
4978
4978
},
4979
4979
"libmultisense" : {
4980
- "baseline" : " 6 .1.0" ,
4980
+ "baseline" : " 7 .1.0" ,
4981
4981
"port-version" : 0
4982
4982
},
4983
4983
"libmupdf" : {
Original file line number Diff line number Diff line change 1
1
{
2
2
"versions" : [
3
+ {
4
+ "git-tree" : " 3d9ad2b386e8089ebfc19a99195434e4cf56809e" ,
5
+ "version" : " 7.1.0" ,
6
+ "port-version" : 0
7
+ },
3
8
{
4
9
"git-tree" : " 720294982a8079963638f6ccb9a5292541f63e82" ,
5
10
"version" : " 6.1.0" ,
You can’t perform that action at this time.
0 commit comments