From f6aed5c2ac50b860241f434b33f9404104508c54 Mon Sep 17 00:00:00 2001 From: satoshi-ota Date: Tue, 21 Feb 2023 11:36:05 +0900 Subject: [PATCH] feat(behavior_path_planner): change framework in cmake Signed-off-by: satoshi-ota --- planning/behavior_path_planner/CMakeLists.txt | 75 +++++++++++++------ 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/planning/behavior_path_planner/CMakeLists.txt b/planning/behavior_path_planner/CMakeLists.txt index afb2a152a0953..444c764f6f5e2 100644 --- a/planning/behavior_path_planner/CMakeLists.txt +++ b/planning/behavior_path_planner/CMakeLists.txt @@ -7,35 +7,18 @@ autoware_package() find_package(OpenCV REQUIRED) find_package(magic_enum CONFIG REQUIRED) -ament_auto_add_library(behavior_path_planner_node SHARED - src/behavior_path_planner_node.cpp - src/behavior_tree_manager.cpp +# use planner manager that supports behavior tree +set(BEHAVIOR_TREE TRUE) +message(STATUS "USE_BEHAVIOR_TREE: " ${BEHAVIOR_TREE}) + +set(common_src src/utilities.cpp src/path_utilities.cpp src/debug_utilities.cpp src/steering_factor_interface.cpp src/turn_signal_decider.cpp - src/scene_module/scene_module_bt_node_interface.cpp - src/scene_module/side_shift/side_shift_module.cpp - src/scene_module/side_shift/util.cpp - src/scene_module/avoidance/avoidance_module.cpp src/scene_module/avoidance/avoidance_utils.cpp - src/scene_module/avoidance/debug.cpp - src/scene_module/lane_following/lane_following_module.cpp - src/scene_module/lane_change/external_request_lane_change_module.cpp - src/scene_module/lane_change/lane_change_module.cpp - src/scene_module/lane_change/util.cpp - src/scene_module/lane_change/debug.cpp - src/scene_module/pull_over/pull_over_module.cpp - src/scene_module/pull_over/util.cpp - src/scene_module/pull_over/shift_pull_over.cpp - src/scene_module/pull_over/geometric_pull_over.cpp - src/scene_module/pull_over/goal_searcher.cpp - src/scene_module/pull_out/pull_out_module.cpp - src/scene_module/pull_out/util.cpp - src/scene_module/pull_out/shift_pull_out.cpp - src/scene_module/pull_out/geometric_pull_out.cpp - src/scene_module/scene_module_visitor.cpp + src/scene_module/side_shift/util.cpp src/util/geometric_parallel_parking/geometric_parallel_parking.cpp src/util/occupancy_grid_based_collision_detector/occupancy_grid_based_collision_detector.cpp src/util/path_shifter/path_shifter.cpp @@ -43,7 +26,51 @@ ament_auto_add_library(behavior_path_planner_node SHARED src/util/drivable_area_expansion/map_utils.cpp src/util/drivable_area_expansion/footprints.cpp src/util/drivable_area_expansion/expansion.cpp -) + ) + +if (BEHAVIOR_TREE) + ament_auto_add_library(behavior_path_planner_node SHARED + src/behavior_path_planner_node.cpp + src/behavior_tree_manager.cpp + src/scene_module/scene_module_visitor.cpp + src/scene_module/scene_module_bt_node_interface.cpp + src/scene_module/side_shift/side_shift_module.cpp + src/scene_module/avoidance/avoidance_module.cpp + src/scene_module/avoidance/debug.cpp + src/scene_module/lane_following/lane_following_module.cpp + src/scene_module/lane_change/external_request_lane_change_module.cpp + src/scene_module/lane_change/lane_change_module.cpp + src/scene_module/lane_change/util.cpp + src/scene_module/lane_change/debug.cpp + src/scene_module/pull_over/pull_over_module.cpp + src/scene_module/pull_over/util.cpp + src/scene_module/pull_over/shift_pull_over.cpp + src/scene_module/pull_over/geometric_pull_over.cpp + src/scene_module/pull_over/goal_searcher.cpp + src/scene_module/pull_out/pull_out_module.cpp + src/scene_module/pull_out/util.cpp + src/scene_module/pull_out/shift_pull_out.cpp + src/scene_module/pull_out/geometric_pull_out.cpp + ${common_src} + ) + + target_compile_definitions(behavior_path_planner_node PRIVATE USE_BEHAVIOR_TREE) + + message(WARNING "Build behavior_path_planner with BT...") + +else () + ament_auto_add_library(behavior_path_planner_node SHARED + src/behavior_path_planner_node.cpp + src/planner_manager.cpp + src/scene_module/scene_module_visitor.cpp + # src/scene_module_v2/avoidance + # src/scene_module_v2/lane_change + # src/scene_module_v2/... + ${common_src} + ) + + message(WARNING "Build behavior_path_planner without BT...") +endif () target_include_directories(behavior_path_planner_node SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR}