Skip to content

add imported target if TinyXML2 was found by FastRTPS#10

Merged
dirk-thomas merged 1 commit intomasterfrom
dirk-thomas/add-imported-target
Jun 4, 2020
Merged

add imported target if TinyXML2 was found by FastRTPS#10
dirk-thomas merged 1 commit intomasterfrom
dirk-thomas/add-imported-target

Conversation

@dirk-thomas
Copy link
Copy Markdown
Member

@dirk-thomas dirk-thomas commented Jun 3, 2020

Fixes ros2/rosbag2#429, fixes ros2/ros2#927.

Build Status

Full CI:

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

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
@dirk-thomas dirk-thomas added the bug Something isn't working label Jun 3, 2020
@dirk-thomas dirk-thomas self-assigned this Jun 3, 2020
Copy link
Copy Markdown
Contributor

@Karsten1987 Karsten1987 left a comment

Choose a reason for hiding this comment

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

Thanks for coming up with a solution. I am hopeful that this will solve the problem we encountered with the include order of find_package.

Two questions though:

  • Would it make sense to add this logic before adding the FindTinyXML2.cmake onto the CMAKE_MODULE_PATH to make sure that only the existing logic for finding tinyxml2 is being used? Basically saying to put the existing line list(INSERT ....) in an else clause, if tinyxml2 is not found yet.
  • I know it's two different cmake files, but can the logic be de-duplicated? I'd prefer to maintain that custom cmake logic only in one place.

@dirk-thomas
Copy link
Copy Markdown
Member Author

Two questions though:

I would consider both for a follow up PR in order to get this fix merged asap.

@Karsten1987
Copy link
Copy Markdown
Contributor

fine by me.

Copy link
Copy Markdown
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

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

looks reasonable to me

@dirk-thomas dirk-thomas merged commit f41314c into master Jun 4, 2020
@delete-merged-branch delete-merged-branch bot deleted the dirk-thomas/add-imported-target branch June 4, 2020 01:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

failing to build rosbag2_tests can't find tinyxml2::tinyxml2

4 participants