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

Fix pkg-config boost entries for Ubuntu Focal (gazebo9) #2751

Merged
merged 5 commits into from
Jul 15, 2020
Merged

Fix pkg-config boost entries for Ubuntu Focal (gazebo9) #2751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
feee577
Fix pkg-config boost entries for Ubuntu Focal (gazebo9)
j-rivero Jun 8, 2020
65d7b33
Merge branch 'gazebo9' into gazebo9_fix_boost_pkgconfig
scpeters Jul 15, 2020
a7f0b0f
fix typo
scpeters Jul 15, 2020
d857951
update changelog
scpeters Jul 15, 2020
ce83594
bump to 9.13.2
scpeters Jul 15, 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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set (GAZEBO_MINOR_VERSION 13)
# The patch version may have been bumped for prerelease purposes; be sure to
# check gazebo-release/ubuntu/debian/changelog@default to determine what the
# next patch version should be for a regular release.
set (GAZEBO_PATCH_VERSION 1)
set (GAZEBO_PATCH_VERSION 2)

set (GAZEBO_VERSION ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION})
set (GAZEBO_VERSION_FULL ${GAZEBO_MAJOR_VERSION}.${GAZEBO_MINOR_VERSION}.${GAZEBO_PATCH_VERSION})
Expand Down Expand Up @@ -386,6 +386,8 @@ else (build_errors)
endif()
# Remove the prefix lib (not always present, like in pthread)
string (REPLACE "lib" "" bname "${bname}")
# Some boost versions add the Boost:: component to cmake, need to change that to boost_ prefix
string (REPLACE "Boost::" "boost_" bname "${bname}")
set (Boost_PKGCONFIG_LIBS "${Boost_PKGCONFIG_LIBS} ${bname}")
endforeach(b)

Expand Down
10 changes: 9 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@

## Gazebo 9.xx.x (202x-xx-xx)

## Gazebo 9.13.2 (202x-xx-xx)

1. Fix sensor update rate throttling when new sensors are spawned
* [Pull request #2784](https://github.com/osrf/gazebo/pull/2784)

1. Fix crash when collision size is zero
* [Pull request #2768](https://github.com/osrf/gazebo/pull/2768)

1. LensFlare: initialize OGRE compositors during plugin initialization
* [Pull request #2762](https://github.com/osrf/gazebo/pull/2762)
* [Pull request #2764](https://github.com/osrf/gazebo/pull/2764)

1. Fix pkg-config boost entries for Ubuntu Focal
* [Pull request #2751](https://github.com/osrf/gazebo/pull/2751)

1. Fixes for ARM: FindSSE, TrackedVehiclePlugin and PluginInterfaceTest
* [Pull request #2754](https://github.com/osrf/gazebo/pull/2754)
Expand Down