Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Use CMake targets instead of variables#21

Merged
sloretz merged 3 commits intoros2from
urdfdom_use_cmake_targets
Sep 18, 2020
Merged

Use CMake targets instead of variables#21
sloretz merged 3 commits intoros2from
urdfdom_use_cmake_targets

Conversation

@sloretz
Copy link
Copy Markdown

@sloretz sloretz commented Sep 15, 2020

Fixes urdfdom not exporting a transitive dependency on urdfdom_headers in its exported targets. This makes the targets use CMake exported targets instead of old-style CMake variables.

I also made urdf_world depend on urdf_model - before urdf_world was building all of urdf_model's sources plus world.cpp. edit had to undo this because windows

more info here: ros2/urdf#17 (comment)

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz
Copy link
Copy Markdown
Author

sloretz commented Sep 15, 2020

CI (build: --packages-above-and-dependencies urdfdom test: --packages-above urdfdom)

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

Copy link
Copy Markdown

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

In principle, I agree with this change and would have approved it. But CI on Windows and macOS is failing to find TinyXML :(.

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz
Copy link
Copy Markdown
Author

sloretz commented Sep 16, 2020

CI with commit using ${TinyXML_INCLUDE_DIRS} (build: --packages-above-and-dependencies urdfdom test: --packages-above urdfdom)

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz
Copy link
Copy Markdown
Author

sloretz commented Sep 18, 2020

CI with attempt at windows fix

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@sloretz
Copy link
Copy Markdown
Author

sloretz commented Sep 18, 2020

@clalancette CI LGTM! Mind giving this another look?

@sloretz sloretz requested a review from clalancette September 18, 2020 20:07
Copy link
Copy Markdown

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

Woohoo! Hopefully this unblocks some of the other URDF stuff.

@sloretz sloretz merged commit af3bb4c into ros2 Sep 18, 2020
@sloretz sloretz deleted the urdfdom_use_cmake_targets branch September 18, 2020 20:21
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