Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop
This commit is contained in:
commit
0edf5fca65
|
@ -133,12 +133,12 @@ install(TARGETS mynteye_wrapper mynteye_wrapper_node
|
||||||
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
|
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
|
||||||
)
|
)
|
||||||
|
|
||||||
install(DIRECTORY launch
|
install(DIRECTORY launch/
|
||||||
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
|
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
|
||||||
)
|
)
|
||||||
|
|
||||||
install(DIRECTORY rviz
|
install(DIRECTORY rviz/
|
||||||
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
|
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz
|
||||||
)
|
)
|
||||||
|
|
||||||
install(FILES nodelet_plugins.xml
|
install(FILES nodelet_plugins.xml
|
||||||
|
|
|
@ -209,7 +209,7 @@
|
||||||
<group ns="$(arg mynteye)">
|
<group ns="$(arg mynteye)">
|
||||||
|
|
||||||
<!-- mynteye_wrapper_node -->
|
<!-- mynteye_wrapper_node -->
|
||||||
<node name="mynteye_wrapper_node" pkg="mynt_eye_ros_wrapper" type="mynteye_wrapper_node" output="screen">
|
<node name="mynteye_wrapper_node" pkg="mynt_eye_ros_wrapper" type="mynteye_wrapper_node" output="screen" respawn="true" respawn_delay="5">
|
||||||
|
|
||||||
<!-- node params -->
|
<!-- node params -->
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user