Merge devel into ros2 branch by ruffsl · Pull Request #303 · OctoMap/octomap

ruffsl · 2020-07-29T01:45:50Z

Looks like the ros2 branch is lagging a bit behind devel. I've just resolved the merge conflict between the cmake version bumps in ros2 and the qt5 package.xml depends from devel. It doesn't look like ament is being used, so I'm not sure why these are two different branches to begin with, given that ament_target_dependencies still doesn't seem to work with this package and headers must be manually included for downstream packages.

Related: moveit/geometric_shapes#154

cc @mikaelarguedas

Do not use std::random_shuffle with C++11 or above

byte is defined in <cstddef> since C++17

Improves ROS2 compatibility with updated package.xml format

Fix unused parameter warning in OccupancyOcTreeBase<NODE>::insertPointCloudRays

- Forgot libqlviewer-qt4-dev as a dependency which caused Melodic builds to fail - This now uses build_depend/exec_depend as previously again

Workaround for RPath on macOS no longer necessary

Still defaults to PREFIX/lib but e.g. Debian or Fedora packagers can easily set it to lib/x86_64-linux-gnu or lib64 respectively.

Thanks to kazuki0824 and anasarrak.

Copied from root CMakeFiles.txt to make this flag default ON even if building octovis as a module.

octovis: Enable Qt5 by default, adjust travis config accordingly

Support configurable libdir to ease packaging

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

Bump CMake version to avoid CMP0048

Recently, OCTOVIS_QT5 was set to ON by default. This requires updated package dependencies to work on the buildfarm.

New keys introduced upstream in ros/rosdistro#24097

…dencies [octovis] Update ROS dependencies to Qt5

std::byte can't be read from a file (no overload of operator >> available), fall back to typedef'fing it to unsigned char again. Related: OctoMap#240

fix ifstream >> byte with c++17

octovis: use -fPIC with all compilers (if available)

octovis adapted to be compatible with libQGLViewer >= 2.7.0

fix qmake command to build libQGLViewer with Qt5.

wxmerkt · 2020-07-29T08:23:59Z

I have a slightly different proposition I'd love your feedback on.

I'd like to propose to retire the ros2 branch entirely and amend the package.xml to support both ROS1 and ROS2 using package format 3 conditions. This is purely a CMake project and I don't see a reason why we need to maintain a separate branch. The only difference between OctoMap for ROS1 & ROS2 is the change from catkin to ament which can be made conditional.

(When we started the ros2 branch, I wasn't aware of the condition="$ROS_VERSION == 1" option for the package format so we could fix that now and only maintain devel.)

What are your thoughts @ruffsl @mikaelarguedas?

ruffsl · 2020-07-29T08:33:08Z

I like the idea of consolidated code base. Are there example package elsewhere in ecosystem we could mimic? I have no idea about mixing catkin with ament via logic switching.

wxmerkt · 2020-07-29T08:36:34Z

I think this PR is a good example: ethz-adrl/ifopt#52

mikaelarguedas · 2020-07-29T08:54:07Z

Yes this sounds like a good plan 👍
It can get tricky (needing quite some conditionals) if catkin or ament macros are used in the CMakeLists. It doesnt seem to be the case here so this should work fine.

One thing for e.g. rosdep is that ROS 2 looks only for packages that are registered in the ament index and not "all places that have a package.xml". So there may be something to tweak there (this issue has some information about it ros-infrastructure/rosdep#724)

wxmerkt · 2021-05-10T21:51:11Z

@ruffsl Can we close this PR now that devel supports ROS2 / the ros2 branch is deprecated?

Jamie Snape and others added 30 commits May 30, 2019 12:18

Do not use std::random_shuffle with C++11 or above

7811ac6

Merge pull request OctoMap#233 from jamiesnape/std-shuffle

a13407d

Do not use std::random_shuffle with C++11 or above

Fix issue with byte typedef when compiling using C++17 (OctoMap#240)

c921775

byte is defined in <cstddef> since C++17

Update package.xml to remove catkin dependency (OctoMap#263)

a95100f

Improves ROS2 compatibility with updated package.xml format

Version 1.9.1 release

046920a

fix unused-parameter warning (OctoMap#267)

4e1e818

Fix unused parameter warning in OccupancyOcTreeBase<NODE>::insertPointCloudRays

[octovis] Fix dependency list for ROS in package.xml (OctoMap#269)

b67b2c5

- Forgot libqlviewer-qt4-dev as a dependency which caused Melodic builds to fail - This now uses build_depend/exec_depend as previously again

Version 1.9.2 release

77cc263

Removed problematic INSTALL_NAME_DIR (OctoMap#262)

31af07e

Workaround for RPath on macOS no longer necessary

Fix -Wpedantic warnings (OctoMap#275)

985cdbe

Version 1.9.3 release

bfc4580

Support configurable libdir

a330c3c

Still defaults to PREFIX/lib but e.g. Debian or Fedora packagers can easily set it to lib/x86_64-linux-gnu or lib64 respectively.

Support QGLViewer-qt5 and enable Qt5 by default

ff95658

Thanks to kazuki0824 and anasarrak.

Travis: upgrade to Qt5 and Ubuntu 18.04 Bionic

c860efd

Add option OCTOVIS_QT5 in octovis/CMakeFiles.txt

ce998c7

Copied from root CMakeFiles.txt to make this flag default ON even if building octovis as a module.

Merge pull request OctoMap#280 from jnumm/qt5-and-travis

8a5aa0c

octovis: Enable Qt5 by default, adjust travis config accordingly

Merge pull request OctoMap#279 from jnumm/install-dirs

b300d38

Support configurable libdir to ease packaging

Bump CMake version to avoid CMP0048

a722c51

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

Merge pull request OctoMap#284 from sloretz/sloretz/cmp0048

ea58697

Bump CMake version to avoid CMP0048

Version 1.9.4 release

812fb98

[octovis] Update dependencies to Qt5

6c7fb60

Recently, OCTOVIS_QT5 was set to ON by default. This requires updated package dependencies to work on the buildfarm.

[octovis] Update required dependencies for Qt5

959f235

New keys introduced upstream in ros/rosdistro#24097

Merge pull request OctoMap#286 from wxmerkt/wxm-fix-qt5-package-depen…

1955d4a

…dencies [octovis] Update ROS dependencies to Qt5

Version 1.9.5 release

2b4bdce

fix ifstream >> byte with c++17

ea9d707

std::byte can't be read from a file (no overload of operator >> available), fall back to typedef'fing it to unsigned char again. Related: OctoMap#240

Merge pull request OctoMap#293 from gleichdick/devel

74c48ae

fix ifstream >> byte with c++17

octovis: use -fPIC with all compilers

845e79f

Merge pull request OctoMap#296 from timonegk/position_independent_code

cae814e

octovis: use -fPIC with all compilers (if available)

adapted code to be compatible with libQGLViewer >= 2.7.0

43bcc2c

Merge pull request OctoMap#297 from expeditioneer/qglviewer

24cd6aa

octovis adapted to be compatible with libQGLViewer >= 2.7.0

hfinger and others added 3 commits June 18, 2020 12:47

fix qmake command to build libQGLViewer with Qt5.

f053e03

Merge pull request OctoMap#298 from hfinger/devel

a3f3809

fix qmake command to build libQGLViewer with Qt5.

Merge remote-tracking branch 'origin/devel' into ros2

09a90a7

wxmerkt mentioned this pull request Jul 29, 2020

REP-136 compliance and compatibility with ROS1 & ROS2 using single branch #304

Merged

ruffsl closed this May 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge devel into ros2 branch#303

Merge devel into ros2 branch#303
ruffsl wants to merge 33 commits intoOctoMap:ros2from
ruffsl:ros2

ruffsl commented Jul 29, 2020

Uh oh!

wxmerkt commented Jul 29, 2020

Uh oh!

ruffsl commented Jul 29, 2020

Uh oh!

wxmerkt commented Jul 29, 2020

Uh oh!

mikaelarguedas commented Jul 29, 2020

Uh oh!

wxmerkt commented May 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Conversation

ruffsl commented Jul 29, 2020

Uh oh!

wxmerkt commented Jul 29, 2020

Uh oh!

ruffsl commented Jul 29, 2020

Uh oh!

wxmerkt commented Jul 29, 2020

Uh oh!

mikaelarguedas commented Jul 29, 2020

Uh oh!

wxmerkt commented May 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants