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.

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

Skip the system directories when looking for OGRE #371

Merged
merged 1 commit into from
Jan 7, 2019
Merged

Conversation

cottsay
Copy link
Member

@cottsay cottsay commented Dec 27, 2018

Fedora provides a CMake module for OGRE which is in a standard search location. This module seems to take precedence over the CMake config that is found via OGRE_DIR. This seemed like the least invasive change to keep that path out of the search without interfering with the module stuff going on to support Windows builds.

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

@cottsay cottsay added the in progress Actively being worked on (Kanban column) label Dec 27, 2018
@cottsay cottsay self-assigned this Dec 27, 2018
@cottsay cottsay added in review Waiting for review (Kanban column) and removed in progress Actively being worked on (Kanban column) labels Dec 27, 2018
@wjwwood
Copy link
Member

wjwwood commented Jan 3, 2019

Feel free to merge yourself. 👍

@cottsay cottsay merged commit 61de77f into ros2 Jan 7, 2019
@cottsay cottsay removed the in review Waiting for review (Kanban column) label Jan 7, 2019
wjwwood added a commit that referenced this pull request Jan 14, 2019
wjwwood added a commit that referenced this pull request Jan 15, 2019
* Revert "Migrate scalar displays (#367)"

This reverts commit 9f3f3a6.

* Revert "Handle FindEigen3 module's differing definitions (#370)"

This reverts commit 2077b3a.

* Revert "Skip the system directories when looking for OGRE (#371)"

This reverts commit 61de77f.

* Revert "Revert "Visibility followup for marker" (#369)"

This reverts commit 712f903.
@cottsay cottsay deleted the skip_system_ogre branch July 31, 2019 00:06
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