From 4c0494d4d5a62395511ffe808a1079ade57d0ae4 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 7 Aug 2023 22:14:19 +0900 Subject: [PATCH 1/2] enable select installing 3d models Signed-off-by: Masaya Kataoka --- robotx_behavior_tree/CMakeLists.txt | 4 +++- .../include/robotx_behavior_tree/action_node.hpp | 2 +- robotx_behavior_tree/plugins/action/move_goal_action.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/robotx_behavior_tree/CMakeLists.txt b/robotx_behavior_tree/CMakeLists.txt index 93ba759..4ba7d21 100644 --- a/robotx_behavior_tree/CMakeLists.txt +++ b/robotx_behavior_tree/CMakeLists.txt @@ -45,7 +45,9 @@ install(TARGETS RUNTIME DESTINATION lib/${PROJECT_NAME} ) -install(DIRECTORY models DESTINATION share/${PROJECT_NAME}) +if($ENV{DEVELOP}) + install(DIRECTORY models DESTINATION share/${PROJECT_NAME}) +endif() if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) diff --git a/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp b/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp index c9594e5..ebc29e1 100644 --- a/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp +++ b/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/robotx_behavior_tree/plugins/action/move_goal_action.cpp b/robotx_behavior_tree/plugins/action/move_goal_action.cpp index 271913d..a3af239 100644 --- a/robotx_behavior_tree/plugins/action/move_goal_action.cpp +++ b/robotx_behavior_tree/plugins/action/move_goal_action.cpp @@ -24,7 +24,7 @@ #include "geometry_msgs/msg/vector3.hpp" #include "rclcpp/rclcpp.hpp" #include "robotx_behavior_tree/action_node.hpp" -#include "tf2_geometry_msgs/tf2_geometry_msgs.h" +#include "tf2_geometry_msgs/tf2_geometry_msgs.hpp" namespace robotx_behavior_tree { From 3f6ab97b7fb5c6dc6a63832c14acaa993d03c5f7 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 7 Aug 2023 22:21:43 +0900 Subject: [PATCH 2/2] apply clang-format Signed-off-by: Masaya Kataoka --- .../include/robotx_behavior_tree/action_node.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp b/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp index ebc29e1..f115bef 100644 --- a/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp +++ b/robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include "tf2_ros/buffer.h" #include "tf2_ros/transform_broadcaster.h"