Merge branch 'bringup-gz-dep' into fix_gz_ros2_control

Pulls in Kinovarobotics#159
PickNikRobotics · Jun 7, 2024 · 09643a7 · 09643a7
2 parents 33ec22c + 43bf56b
commit 09643a7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/kortex_bringup/package.xml b/kortex_bringup/package.xml
@@ -22,7 +22,8 @@
   <exec_depend>rviz2</exec_depend>
   <exec_depend>urdf</exec_depend>
   <exec_depend>xacro</exec_depend>
-  <exec_depend>gazebo_ros2_control</exec_depend>
+  <exec_depend condition="$ROS_DISTRO == humble">ign_ros2_control</exec_depend>
+  <exec_depend condition="$ROS_DISTRO != humble">gz_ros2_control</exec_depend>
   <exec_depend>gripper_controllers</exec_depend>
   <exec_depend>joint_trajectory_controller</exec_depend>
   <exec_depend>joint_state_broadcaster</exec_depend>