From 4c4c1303f08cd46f6377ca6b3c7d8e3fb938b361 Mon Sep 17 00:00:00 2001 From: Nobi Tuna Date: Sun, 22 Nov 2020 10:45:09 -0500 Subject: [PATCH 1/2] Cleanup by roscompile --- vorc_gazebo/package.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vorc_gazebo/package.xml b/vorc_gazebo/package.xml index b5cc21a..4f3813f 100644 --- a/vorc_gazebo/package.xml +++ b/vorc_gazebo/package.xml @@ -12,8 +12,14 @@ catkin + cora_description gazebo_dev gazebo_ros + joint_state_publisher + robot_localization + robot_state_publisher + rospy + rviz vrx_gazebo wamv_gazebo wave_gazebo From 9a310064a5cef238cc88913e48c8ec4fec6b421b Mon Sep 17 00:00:00 2001 From: Nobi Tuna Date: Tue, 24 Nov 2020 22:53:42 -0500 Subject: [PATCH 2/2] Fix build failure for ROS Noetic (See https://github.com/ros/xacro/issues/192#issuecomment-733444479). --- cora_description/CMakeLists.txt | 2 +- vorc_gazebo/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cora_description/CMakeLists.txt b/cora_description/CMakeLists.txt index cecdc5b..b1d1739 100644 --- a/cora_description/CMakeLists.txt +++ b/cora_description/CMakeLists.txt @@ -18,7 +18,7 @@ catkin_package( xacro_add_files( urdf/cora.urdf.xacro - INORDER INSTALL DESTINATION urdf + INSTALL DESTINATION urdf ) install(DIRECTORY models/ diff --git a/vorc_gazebo/CMakeLists.txt b/vorc_gazebo/CMakeLists.txt index 8acc18e..92bff3f 100644 --- a/vorc_gazebo/CMakeLists.txt +++ b/vorc_gazebo/CMakeLists.txt @@ -45,7 +45,7 @@ xacro_add_files( worlds/station_keeping.world.xacro worlds/wayfinding.world.xacro worlds/gymkhana.world.xacro - INORDER INSTALL DESTINATION worlds + INSTALL DESTINATION worlds ) install(DIRECTORY worlds/