Skip to content

Commit d8ecc87

Browse files
committed
Merge remote-tracking branch 'origin/main' into fullrebuild-202606
2 parents bc853b5 + f436340 commit d8ecc87

3 files changed

Lines changed: 59 additions & 0 deletions

File tree

patch/dependencies.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,3 +301,5 @@ depth_image_proc:
301301
rqt_mocap4r2_control:
302302
remove_host: ["qt-main"]
303303
remove_run: ["qt-main"]
304+
zstd_point_cloud_transport:
305+
add_host: ["ros-rolling-zstd-cmake-module", "zstd"]
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
diff --git a/zstd_point_cloud_transport/CMakeLists.txt b/zstd_point_cloud_transport/CMakeLists.txt
2+
index 51e2d6c..332290e 100644
3+
--- a/zstd_point_cloud_transport/CMakeLists.txt
4+
+++ b/zstd_point_cloud_transport/CMakeLists.txt
5+
@@ -9,12 +9,16 @@ find_package(pluginlib REQUIRED)
6+
find_package(point_cloud_interfaces REQUIRED)
7+
find_package(point_cloud_transport REQUIRED)
8+
find_package(rclcpp REQUIRED)
9+
+find_package(zstd_cmake_module REQUIRED)
10+
+find_package(zstd REQUIRED)
11+
12+
set(dependencies
13+
pluginlib
14+
point_cloud_interfaces
15+
point_cloud_transport
16+
rclcpp
17+
+ zstd_cmake_module
18+
+ zstd
19+
)
20+
21+
add_library(${PROJECT_NAME}
22+
@@ -29,7 +33,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
23+
${point_cloud_interfaces_TARGETS}
24+
point_cloud_transport::point_cloud_transport
25+
rclcpp::rclcpp
26+
- zstd
27+
+ zstd::zstd
28+
)
29+
30+
target_include_directories(${PROJECT_NAME} PRIVATE
31+
diff --git a/zstd_point_cloud_transport/include/zstd_point_cloud_transport/zstd_subscriber.hpp b/zstd_point_cloud_transport/include/zstd_point_cloud_transport/zstd_subscriber.hpp
32+
index b5828d3..cfea8f0 100644
33+
--- a/zstd_point_cloud_transport/include/zstd_point_cloud_transport/zstd_subscriber.hpp
34+
+++ b/zstd_point_cloud_transport/include/zstd_point_cloud_transport/zstd_subscriber.hpp
35+
@@ -51,8 +51,6 @@ class ZstdSubscriber
36+
public:
37+
ZstdSubscriber();
38+
39+
- std::string getTransportName() const override;
40+
-
41+
void declareParameters() override;
42+
43+
std::string getDataType() const override;
44+
diff --git a/zstd_point_cloud_transport/package.xml b/zstd_point_cloud_transport/package.xml
45+
index 17fc04a..fa0e39b 100644
46+
--- a/zstd_point_cloud_transport/package.xml
47+
+++ b/zstd_point_cloud_transport/package.xml
48+
@@ -22,7 +22,7 @@
49+
<depend>point_cloud_interfaces</depend>
50+
<depend>point_cloud_transport</depend>
51+
<depend>rclcpp</depend>
52+
- <depend>libzstd-dev</depend>
53+
+ <depend>zstd_cmake_module</depend>
54+
55+
<test_depend>ament_lint_auto</test_depend>
56+
<test_depend>ament_lint_common</test_depend>

vinca.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ packages_select_by_deps:
119119
- bondcpp
120120
- nav2_minimal_tb3_sim
121121
- nav2_minimal_tb4_sim
122+
- point_cloud_transport_plugins
122123

123124
- autoware_internal_msgs
124125
- autoware_common_msgs

0 commit comments

Comments
 (0)