fix build depends

PickNikRobotics · Jun 17, 2022 · ea92168 · ea92168
1 parent 86466cf
commit ea92168
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 7 deletions.
diff --git a/deep_grasp_task/CMakeLists.txt b/deep_grasp_task/CMakeLists.txt
@@ -19,6 +19,7 @@ find_package(catkin REQUIRED COMPONENTS
 	moveit_task_constructor_msgs
   roscpp
 	rosparam_shortcuts
+  rviz_marker_tools
 )
 
 ###################################
@@ -27,6 +28,7 @@ find_package(catkin REQUIRED COMPONENTS
 catkin_package(
  INCLUDE_DIRS include
  CATKIN_DEPENDS
+  actionlib
 	moveit_task_constructor_msgs
  	roscpp
 )

diff --git a/deep_grasp_task/package.xml b/deep_grasp_task/package.xml
@@ -17,4 +17,18 @@
   <depend>moveit_core</depend>
   <depend>roscpp</depend>
   <depend>rosparam_shortcuts</depend>
+  <depend>rviz_marker_tools</depend>
+
+  <exec_depend>gazebo_ros</exec_depend>
+  <exec_depend>joint_state_publisher</exec_depend>
+  <exec_depend>moveit_task_constructor_demo</exec_depend>
+  <exec_depend>moveit_task_constructor_gpd</exec_depend>
+  <exec_depend>moveit_task_constructor_dexnet</exec_depend>
+  <exec_depend>panda_moveit_config</exec_depend>
+  <exec_depend>robot_state_publisher</exec_depend>
+  <exec_depend>rviz</exec_depend>
+  <exec_depend>tf2_ros</exec_depend>
+  <exec_depend>topic_tools</exec_depend>
+  <exec_depend>xacro</exec_depend>
+
 </package>
diff --git a/moveit_task_constructor_dexnet/CMakeLists.txt b/moveit_task_constructor_dexnet/CMakeLists.txt
@@ -15,9 +15,10 @@ find_package(catkin REQUIRED COMPONENTS
 	actionlib
 	cv_bridge
 	geometry_msgs
+  grasping_msgs
 	image_transport
 	message_generation
-	moveit_task_constructor_msgs
+  moveit_msgs
 	roscpp
 	rosparam_shortcuts
 	rospy
@@ -49,9 +50,11 @@ generate_messages(
 catkin_package(
  INCLUDE_DIRS include
  CATKIN_DEPENDS
+  actionlib
  	geometry_msgs
+  grasping_msgs
 	message_runtime
-	moveit_task_constructor_msgs
+  moveit_msgs
  	roscpp
 	rospy
 	sensor_msgs

diff --git a/moveit_task_constructor_dexnet/package.xml b/moveit_task_constructor_dexnet/package.xml
@@ -15,12 +15,15 @@
   <depend>actionlib</depend>
   <depend>cv_bridge</depend>
   <depend>geometry_msgs</depend>
-  <depend>moveit_task_constructor_msgs</depend>
+  <depend>grasping_msgs</depend>
   <depend>image_transport</depend>
   <depend>roscpp</depend>
   <depend>rospy</depend>
   <depend>rosparam_shortcuts</depend>
   <depend>sensor_msgs</depend>
   <depend>std_msgs</depend>
+  <depend>moveit_msgs</depend>
+
+  <exec_depend>deep_grasp_task</exec_depend>
   <exec_depend>message_runtime</exec_depend>
 </package>
diff --git a/moveit_task_constructor_dexnet/src/grasp_detection.cpp b/moveit_task_constructor_dexnet/src/grasp_detection.cpp
@@ -38,6 +38,7 @@
 #include <ros/ros.h>
 #include <rosparam_shortcuts/rosparam_shortcuts.h>
 #include <geometry_msgs/PoseStamped.h>
+#include <moveit_msgs/Grasp.h>
 
 // C++
 #include <vector>

diff --git a/moveit_task_constructor_gpd/CMakeLists.txt b/moveit_task_constructor_gpd/CMakeLists.txt
@@ -15,8 +15,9 @@ find_package(catkin REQUIRED COMPONENTS
 	actionlib
 	eigen_conversions
 	geometry_msgs
+	grasping_msgs
 	message_generation
-	moveit_task_constructor_msgs
+	moveit_msgs
 	roscpp
 	rosparam_shortcuts
 	sensor_msgs
@@ -61,16 +62,18 @@ catkin_package(
 	INCLUDE_DIRS include
 	LIBRARIES ${PROJECT_NAME}
 	CATKIN_DEPENDS
+		actionlib
 	  eigen_conversions
 		geometry_msgs
+		grasping_msgs
 		message_runtime
-		moveit_task_constructor_msgs
+		moveit_msgs
 		sensor_msgs
 		std_msgs
  	DEPENDS
  		EIGEN3
-		PCL
 		OpenCV
+		PCL
 )
 
 ###########

diff --git a/moveit_task_constructor_gpd/package.xml b/moveit_task_constructor_gpd/package.xml
@@ -16,10 +16,13 @@
   <depend>actionlib</depend>
   <depend>eigen_conversions</depend>
   <depend>geometry_msgs</depend>
-  <depend>moveit_task_constructor_msgs</depend>
+  <depend>grasping_msgs</depend>
   <depend>rosparam_shortcuts</depend>
   <depend>sensor_msgs</depend>
   <depend>std_msgs</depend>
+  <depend>moveit_msgs</depend>
+
+  <exec_depend>deep_grasp_task</exec_depend>
   <exec_depend>message_runtime</exec_depend>
   <!-- <exec_depend version_gte="0.7.4">panda_moveit_config</exec_depend> -->
 </package>
diff --git a/moveit_task_constructor_gpd/src/grasp_detection.cpp b/moveit_task_constructor_gpd/src/grasp_detection.cpp
@@ -40,6 +40,7 @@
 #include <geometry_msgs/PoseStamped.h>
 #include <rosparam_shortcuts/rosparam_shortcuts.h>
 #include <pcl_conversions/pcl_conversions.h>
+#include <moveit_msgs/Grasp.h>
 
 // Eigen
 #include <Eigen/Dense>