Skip to content
This repository has been archived by the owner on Jul 22, 2021. It is now read-only.

Port to fcl 0.6.1 #194

Merged
merged 10 commits into from
Dec 8, 2020
Merged

Port to fcl 0.6.1 #194

merged 10 commits into from
Dec 8, 2020

Conversation

ddengster
Copy link
Contributor

@ddengster ddengster commented Oct 22, 2020

As per title.

At the moment Foxy only has fcl-0.5, so this requires some adjustments to the build process; you'll have to pull in this branch into your workspace and colcon build it.

Relevant PR with fix: flexible-collision-library/fcl#505

Copy link
Member

@mxgrey mxgrey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this requires a non-trivial dependency change in the version of FCL, I'm concerned these changes could get stuck in PR limbo until eventually merge conflicts start to develop. To avoid that, I'd like to suggest that we tweak this PR to make it compatible with both 0.5 and 0.6 when compiling from source.

I've left inline comments to help guide the cross-compatibility effort.

rmf_traffic/CMakeLists.txt Outdated Show resolved Hide resolved
rmf_traffic/CMakeLists.txt Show resolved Hide resolved
rmf_traffic/CMakeLists.txt Show resolved Hide resolved
@@ -11,8 +11,7 @@
<build_depend>rmf_utils</build_depend>
<build_export_depend>rmf_utils</build_export_depend>

<build_depend>libccd-dev</build_depend>
<build_depend>libfcl-dev</build_depend>
<build_depend>fcl</build_depend>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what we can/should do about this to make it backwards compatible. One option might be to keep the old two build_depend tags in here for now. I don't think there's much harm in having redundant dependency declarations.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ddengster ddengster requested a review from mxgrey October 28, 2020 06:27
@ddengster ddengster marked this pull request as ready for review November 25, 2020 05:47
@ddengster
Copy link
Contributor Author

ddengster commented Nov 25, 2020

the upstream FCL PR flexible-collision-library/fcl#505 has been merged

Copy link
Member

@mxgrey mxgrey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are just two small changes needed in the cmake to ensure future-proofing and cross-compatibility.

rmf_traffic/CMakeLists.txt Outdated Show resolved Hide resolved
rmf_traffic/CMakeLists.txt Outdated Show resolved Hide resolved
ddengster and others added 2 commits December 8, 2020 10:36
Co-authored-by: Grey <grey@openrobotics.org>
Co-authored-by: Grey <grey@openrobotics.org>
@mxgrey mxgrey merged commit 8459000 into master Dec 8, 2020
@mxgrey mxgrey deleted the feature/port_fcl-0.6 branch December 8, 2020 04:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants