Skip to content
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

Jump to bottom

Fix dependencies for Ignition robot sim package #45

Merged
merged 3 commits into from
Sep 7, 2021
Merged

Fix dependencies for Ignition robot sim package #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce149d6
Fix dependencies for Ignition robot sim package
luca-della-vedova Sep 1, 2021
477075a
Update changelog
luca-della-vedova Sep 3, 2021
eea3a7c
Merge branch 'main' into fix/release_dependencies
Sep 6, 2021
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 rmf_building_sim_common/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# building\_plugins\_common
# rmf\_building\_sim\_common

This package provides a common library for the Ignition and Gazebo simulator plugins for simulated building infrastructure.

Expand Down
2 changes: 1 addition & 1 deletion rmf_building_sim_gazebo_plugins/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# building\_gazebo\_plugins
# rmf\_building\_sim\_gazebo\_plugins

This package provides Gazebo simulator plugins for allowing simulated building infrastructure to communicate with a ROS system.

Expand Down
6 changes: 1 addition & 5 deletions rmf_building_sim_ignition_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ endif()
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)

find_package(ignition-cmake2 QUIET)
if (NOT ignition-cmake2_FOUND)
message("ignition-cmake not found, skipping ignition gazebo plugins")
return()
endif()
find_package(ignition-cmake2 REQUIRED)

ign_find_package(ignition-gazebo5 REQUIRED)
set(IGN_GAZEBO_VER 5)
Expand Down
2 changes: 1 addition & 1 deletion rmf_building_sim_ignition_plugins/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# building\_gazebo\_plugins
# rmf\_building\_sim\_ignition\_plugins

This package provides Ignition plugins for allowing simulated building infrastructure to communicate with a ROS system.

Expand Down
1 change: 1 addition & 0 deletions rmf_robot_sim_ignition_plugins/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog for package rmf_robot_sim_ignition_plugins

1.3.0 (2021-09-01)
------------------
* Make Ignition Edifice dependency mandatory to fix binary builds(`#45 <https://github.com/open-rmf/rmf_simulation/issues/45>`_)
* Change parameter tag from holonomic to steering (`#46 <https://github.com/open-rmf/rmf_simulation/issues/46>`_)
* Change slotcar control to explicitly open loop (`#43 <https://github.com/open-rmf/rmf_simulation/issues/43>`_)
* Nonholonomic slotcar turning fixes, add turning multiplier offset parameter, rename compute_ds variables (`#41 <https://github.com/open-rmf/rmf_simulation/issues/41>`_)
Expand Down
15 changes: 3 additions & 12 deletions rmf_robot_sim_ignition_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,9 @@ endif()
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)

find_package(ignition-cmake2 QUIET)
if (NOT ignition-cmake2_FOUND)
message("ignition-cmake not found, skipping ignition gazebo plugins")
return()
endif()
ign_find_package(ignition-gazebo5 QUIET)
if (NOT ignition-gazebo5_FOUND)
message("Wrong ignition-gazebo version found. Plugins require ignition-gazebo5 (edifice)")
# To generate a setup.bash and avoid CMake warnings
ament_package()
return()
endif()
find_package(ignition-cmake2 REQUIRED)

ign_find_package(ignition-gazebo5 REQUIRED)
set(IGN_GAZEBO_VER 5)
ign_find_package(ignition-plugin1 REQUIRED COMPONENTS register)
set(IGN_PLUGIN_VER 1)
Expand Down
1 change: 1 addition & 0 deletions rmf_robot_sim_ignition_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<depend>libqt5-core</depend>
<depend>libqt5-qml</depend>
<depend>libqt5-quick</depend>
<depend>ignition-edifice</depend>

<export>
<build_type>ament_cmake</build_type>
Expand Down