Skip to content

WIP: 1) Compatible with ROS Noetic, 2) Cleanup #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
d130s wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: 1) Compatible with ROS Noetic, 2) Cleanup #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c4c130
Cleanup by roscompile
Nov 22, 2020
9a31006
Fix build failure for ROS Noetic (See https://github.com/ros/xacro/is…
Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cora_description/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ catkin_package(

xacro_add_files(
urdf/cora.urdf.xacro
INORDER INSTALL DESTINATION urdf
INSTALL DESTINATION urdf
)

install(DIRECTORY models/
Expand Down
2 changes: 1 addition & 1 deletion vorc_gazebo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 6 additions & 0 deletions vorc_gazebo/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@

<buildtool_depend>catkin</buildtool_depend>

<depend>cora_description</depend>
<depend>gazebo_dev</depend>
<depend version_gte="2.5.17">gazebo_ros</depend>
<depend>joint_state_publisher</depend>
<depend>robot_localization</depend>
<depend>robot_state_publisher</depend>
<depend>rospy</depend>
<depend>rviz</depend>
<depend>vrx_gazebo</depend>
<depend>wamv_gazebo</depend>
<depend>wave_gazebo</depend>
Expand Down