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

Prioritize source tree includes #1392

Merged

Conversation

ericmehl
Copy link
Collaborator

@ericmehl ericmehl commented Nov 2, 2023

This copies the approach taken in GafferHQ/gaffer#5375 to make sure includes on Windows are taken from the source tree before those in other directories. It has the benefit of picking the correct headers as well as resolving a frequent error on many-core systems when the file was being included and copied to the build directory at the same time.

Checklist

  • I have read the contribution guidelines.
  • I have updated the documentation, if applicable.
  • I have tested my change(s) in the test suite, and added new test cases where necessary.
  • My code follows the Cortex project's prevailing coding style and conventions.

This fixes the include order so that headers in the source tree are prioritized over those in the build tree. See GafferHQ/gaffer@e2f5942 for more explanation.
Copy link
Member

@johnhaddon johnhaddon left a comment

Choose a reason for hiding this comment

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

LGTM

@johnhaddon johnhaddon merged commit 0b6774b into ImageEngine:RB-10.5 Nov 3, 2023
3 of 4 checks passed
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