Merge pull request #91 from OUXT-Polaris/feature/develop_option

enable select installing 3d models
OUXT-Polaris · Aug 7, 2023 · 90dc7fb · 90dc7fb
2 parents ed3b92c + 3f6ab97
commit 90dc7fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -18,7 +18,6 @@
 #include <behaviortree_cpp_v3/action_node.h>
 #include <behaviortree_cpp_v3/bt_factory.h>
 #include <quaternion_operation/quaternion_operation.h>
-#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
 
 #include <algorithm>
 #include <geometry_msgs/msg/pose_stamped.hpp>
@@ -27,6 +26,7 @@
 #include <robotx_behavior_msgs/msg/task_objects_array_stamped.hpp>
 #include <stdexcept>
 #include <string>
+#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 
 #include "tf2_ros/buffer.h"
 #include "tf2_ros/transform_broadcaster.h"

diff --git 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
 {