Skip to content

Fixing bad cherry pick#876

Merged
danthony06 merged 2 commits into
swri-robotics:kilted-develfrom
danthony06:rqt_fix
May 29, 2026
Merged

Fixing bad cherry pick#876
danthony06 merged 2 commits into
swri-robotics:kilted-develfrom
danthony06:rqt_fix

Conversation

@danthony06

Copy link
Copy Markdown
Member

No description provided.

@danthony06 danthony06 requested a review from DangitBen May 28, 2026 03:07
@DangitBen

Copy link
Copy Markdown
Member

I'm not sure about these changes. Why are those additions causing issues?

@danthony06

Copy link
Copy Markdown
Member Author

This is backporting the RQT fix to the kilted-devel branch until we get 3.0 released to all ROS distros. I made a bad cherry pick and accidentally pushed directly to the main repo, so this is fixing that cherry pick.

@DangitBen DangitBen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I can't test this but after looking through the cmakelists.txt it seems fine. The build issue is still a problem.

@DangitBen DangitBen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Need to fix build issue with bad include.

https://github.com/danthony06/mapviz/blob/rqt_fix/tile_map/include/tile_map/stadia_source.h#L34

Needs to change from:

#include <tile_map/tile_source.hpp>

To:

#include "tile_source.h"

@danthony06

Copy link
Copy Markdown
Member Author

@DangitBen should be good to go now

@DangitBen DangitBen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good!

@danthony06 danthony06 merged commit 9c3de7b into swri-robotics:kilted-devel May 29, 2026
6 checks passed
@danthony06 danthony06 deleted the rqt_fix branch May 29, 2026 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants