Skip to content

Commit eb76b24

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

2 files changed

Lines changed: 26 additions & 4 deletions

File tree

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index d7c9b752..6d43bf5b 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -4,6 +4,8 @@ project(autoware_behavior_velocity_planner_common)
6+
find_package(autoware_cmake REQUIRED)
7+
autoware_package()
8+
9+
+find_package(tl-expected REQUIRED)
10+
+
11+
ament_auto_add_library(${PROJECT_NAME} SHARED
12+
src/scene_module_interface.cpp
13+
src/planner_data.cpp
14+
@@ -16,6 +18,10 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
15+
src/experimental/scene_module_interface.cpp
16+
)
17+
18+
+target_link_libraries(${PROJECT_NAME}
19+
+ tl::expected
20+
+)
21+
+
22+
if(BUILD_TESTING)
23+
file(GLOB TEST_SOURCES test/src/*.cpp)
24+
ament_add_ros_isolated_gtest(test_${PROJECT_NAME} ${TEST_SOURCES})

patch/ros-rolling-autoware-trajectory.patch

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index ce27aa99..8dd0c7db 100644
2+
index ce27aa99..b949bd94 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -17,6 +17,8 @@ endif()
@@ -11,16 +11,14 @@ index ce27aa99..8dd0c7db 100644
1111
ament_auto_add_library(autoware_trajectory SHARED
1212
src/threshold.cpp
1313
src/point.cpp
14-
@@ -44,6 +46,13 @@ ament_auto_add_library(autoware_trajectory SHARED
14+
@@ -44,6 +46,11 @@ ament_auto_add_library(autoware_trajectory SHARED
1515
src/utils/velocity.cpp
1616
)
1717

1818
+target_link_libraries(autoware_trajectory
1919
+ fmt::fmt
2020
+ tl::expected
2121
+)
22-
+
23-
+ament_export_dependencies(fmt tl-expected)
2422
+
2523
if(BUILD_TESTING)
2624
ament_auto_find_test_dependencies()

0 commit comments

Comments
 (0)