Skip to content

Commit af8d131

Browse files
Daisuke NishimatsuDaisuke Nishimatsu
authored andcommitted
update patch
Signed-off-by: Daisuke Nishimatsu <daisuke@DaisukenoMacBook-Air.local>
1 parent bbee5c9 commit af8d131

3 files changed

Lines changed: 20 additions & 36 deletions

File tree

patch/dependencies.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ autoware_utils_debug:
256256
add_host: ["fmt"]
257257
autoware_trajectory:
258258
add_host: ["fmt", "cpp-expected"]
259+
autoware_behavior_velocity_planner:
260+
add_host: ["cpp-expected"]
259261
autoware_behavior_velocity_planner_common:
260262
add_host: ["cpp-expected"]
261263
rclpy:

patch/ros-rolling-autoware-behavior-velocity-planner-common.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

patch/ros-rolling-autoware-trajectory.patch

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index ce27aa99..b949bd94 100644
2+
index ce27aa99..1cecb42e 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -17,6 +17,8 @@ endif()
6-
find_package(autoware_cmake REQUIRED)
7-
autoware_package()
8-
9-
+find_package(tl-expected REQUIRED)
10-
+
11-
ament_auto_add_library(autoware_trajectory SHARED
12-
src/threshold.cpp
13-
src/point.cpp
14-
@@ -44,6 +46,11 @@ ament_auto_add_library(autoware_trajectory SHARED
5+
@@ -44,6 +44,10 @@ ament_auto_add_library(autoware_trajectory SHARED
156
src/utils/velocity.cpp
167
)
178

189
+target_link_libraries(autoware_trajectory
1910
+ fmt::fmt
20-
+ tl::expected
2111
+)
2212
+
2313
if(BUILD_TESTING)
@@ -104,6 +94,22 @@ index 552cbed6..2ae854b6 100644
10494

10595
#include <string>
10696
#include <utility>
97+
diff --git a/package.xml b/package.xml
98+
index ce32e58e..3eda3284 100644
99+
--- a/package.xml
100+
+++ b/package.xml
101+
@@ -26,10 +26,10 @@
102+
<depend>fmt</depend>
103+
<depend>geometry_msgs</depend>
104+
<depend>lanelet2_core</depend>
105+
+ <depend>libexpected-dev</depend>
106+
<depend>rclcpp</depend>
107+
<depend>tf2</depend>
108+
<depend>tf2_geometry_msgs</depend>
109+
- <depend>tl_expected</depend>
110+
<depend>yaml-cpp</depend>
111+
112+
<test_depend>ament_cmake_auto</test_depend>
107113
diff --git a/src/utils/reference_path.cpp b/src/utils/reference_path.cpp
108114
index b8beb1b8..db8aec3f 100644
109115
--- a/src/utils/reference_path.cpp

0 commit comments

Comments
 (0)