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

Disable externalwrench plugin if Gazebo version < 8.0 #434

Merged
merged 3 commits into from
Jul 3, 2019
Merged

Disable externalwrench plugin if Gazebo version < 8.0 #434

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
7d89d35
disable extwrench plugin is gazebo version < 8.0
gabrielenava Jul 2, 2019
f40ebbd
updated CHANGELOG
gabrielenava Jul 3, 2019
612be02
Update CHANGELOG.md
gabrielenava Jul 3, 2019
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.

The format of this document is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]
### Fixed
- Fixed compilation on Gazebo 7 by disabling compilation of `externalwrench` plugin if the project is configured with Gazebo 7 (https://github.com/robotology/gazebo-yarp-plugins/pull/434).

## [3.2.0] - 2019-07-01
### Added
- Add `resetSimulation` method to reset simulation state and time time, in the `gazebo_yarp_clock` RPC interface (https://github.com/robotology/gazebo-yarp-plugins/pull/345).
Expand Down
9 changes: 7 additions & 2 deletions plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
add_subdirectory(camera)
add_subdirectory(clock)
add_subdirectory(controlboard)
add_subdirectory(externalwrench)

# Disable externalwrench plugin if Gazebo version is < 8.0
if (NOT GAZEBO_VERSION VERSION_LESS 8.0)
add_subdirectory(externalwrench)
endif()

add_subdirectory(fakecontrolboard)
add_subdirectory(forcetorque)
add_subdirectory(imu)
Expand Down Expand Up @@ -37,4 +42,4 @@ add_subdirectory(depthCamera)
add_subdirectory(contactloadcellarray)
add_subdirectory(modelposepublisher)
add_subdirectory(basestate)
add_subdirectory(configurationoverride)
add_subdirectory(configurationoverride)