Skip to content

Commit

Permalink
Merge pull request #177 in SWDEV/franka_ros from fix-python-version t…
Browse files Browse the repository at this point in the history
…o develop

* commit 'bcd58208ce0b003e6621ad211139b2e9b545fecb':
  add catkin_install_python to CMakeLists.txt to generate proper shebang headers
  • Loading branch information
Marco Boneberger authored and Marco Boneberger committed Mar 15, 2022
2 parents 2514ae1 + bcd5820 commit 30dc6b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions franka_gazebo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ install(TARGETS franka_hw_sim franka_gripper_sim
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

catkin_install_python(PROGRAMS scripts/delayed_controller_spawner.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
Expand Down
3 changes: 3 additions & 0 deletions franka_gazebo/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
<test_depend>sensor_msgs</test_depend>
<test_depend>geometry_msgs</test_depend>

<exec_depend>rospy</exec_depend>
<exec_depend>roslaunch</exec_depend>

<export>
<controller_interface plugin="${prefix}/franka_gripper_sim_plugin.xml"/>
<gazebo_ros_control plugin="${prefix}/franka_hw_sim_plugin.xml"/>
Expand Down

0 comments on commit 30dc6b8

Please sign in to comment.