Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

terrible hack to suppress cmake warning #534

Merged
merged 4 commits into from
May 2, 2020
Merged

terrible hack to suppress cmake warning #534

merged 4 commits into from
May 2, 2020

Conversation

wjwwood
Copy link
Member

@wjwwood wjwwood commented Apr 30, 2020

Fixes #524

@wjwwood
terrible hack to suppress cmake warning
6bd5472 
Signed-off-by: William Woodall <william@osrfoundation.org>
@wjwwood wjwwood added the enhancement New feature or request label Apr 30, 2020
@wjwwood wjwwood self-assigned this Apr 30, 2020
@wjwwood
adjust terrible hack to account for different architectures
a37cda5 
Signed-off-by: William Woodall <william@osrfoundation.org>
@wjwwood
fixup
ff8f8e9 
Signed-off-by: William Woodall <william@osrfoundation.org>
jacobperron
jacobperron approved these changes Apr 30, 2020
View reviewed changes
Copy link
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

LGTM pending CI

@wjwwood
Copy link
Member Author

wjwwood commented Apr 30, 2020 •
edited
Loading

CI before this change:

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

CI after this change:

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

CI on Linux up to rviz2 (build and test) only Fast-RTPS:

  • Linux Build Status

@jacobperron
Copy link
Member

The CI up to rviz2 doesn't appear to be testing the branch with the patch.

@wjwwood
Copy link
Member Author

wjwwood commented Apr 30, 2020

Oops my mistake started a new job.

@wjwwood
Copy link
Member Author

wjwwood commented May 1, 2020

Update on this one, because we find_package assimp in a few places, I need a better patch. I've been working on it, but I'm not done yet.

@wjwwood
extend hack to packages which find package rviz_assimp_vendor
b7dd0e4 
Signed-off-by: William Woodall <william@osrfoundation.org>
@wjwwood
Copy link
Member Author

wjwwood commented May 2, 2020

CI after improving the hacks:

  • Linux Build Status (test failure is flake8 in resource_retriever, unrelated)

@wjwwood wjwwood requested a review from jacobperron May 2, 2020 00:39
@wjwwood wjwwood merged commit 9c69077 into ros2 May 2, 2020
@delete-merged-branch delete-merged-branch bot deleted the suppress_assimp_warning branch May 2, 2020 00:53
@wjwwood wjwwood mentioned this pull request May 5, 2020
Closed
@wjwwood wjwwood mentioned this pull request May 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacobperron jacobperron jacobperron approved these changes

@sloretz sloretz Awaiting requested review from sloretz

Assignees

@wjwwood wjwwood

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rviz_assimp_vendor CMake CMP0012 build error
2 participants
@wjwwood @jacobperron