Skip to content

Commit 90dc7fb

Browse files
authored
Merge pull request #91 from OUXT-Polaris/feature/develop_option
enable select installing 3d models
2 parents ed3b92c + 3f6ab97 commit 90dc7fb

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

robotx_behavior_tree/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ install(TARGETS
4545
RUNTIME DESTINATION lib/${PROJECT_NAME}
4646
)
4747

48-
install(DIRECTORY models DESTINATION share/${PROJECT_NAME})
48+
if($ENV{DEVELOP})
49+
install(DIRECTORY models DESTINATION share/${PROJECT_NAME})
50+
endif()
4951

5052
if(BUILD_TESTING)
5153
find_package(ament_lint_auto REQUIRED)

robotx_behavior_tree/include/robotx_behavior_tree/action_node.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <behaviortree_cpp_v3/action_node.h>
1919
#include <behaviortree_cpp_v3/bt_factory.h>
2020
#include <quaternion_operation/quaternion_operation.h>
21-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
2221

2322
#include <algorithm>
2423
#include <geometry_msgs/msg/pose_stamped.hpp>
@@ -27,6 +26,7 @@
2726
#include <robotx_behavior_msgs/msg/task_objects_array_stamped.hpp>
2827
#include <stdexcept>
2928
#include <string>
29+
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
3030

3131
#include "tf2_ros/buffer.h"
3232
#include "tf2_ros/transform_broadcaster.h"

robotx_behavior_tree/plugins/action/move_goal_action.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "geometry_msgs/msg/vector3.hpp"
2525
#include "rclcpp/rclcpp.hpp"
2626
#include "robotx_behavior_tree/action_node.hpp"
27-
#include "tf2_geometry_msgs/tf2_geometry_msgs.h"
27+
#include "tf2_geometry_msgs/tf2_geometry_msgs.hpp"
2828

2929
namespace robotx_behavior_tree
3030
{

0 commit comments

Comments
 (0)