update include directives for OpenImageIO_ROOT#1997
Merged
lgritz merged 1 commit intoJun 13, 2025
Conversation
Collaborator
|
Needs DCO signoff |
Collaborator
|
On a one-commit PR like this, you should be able to do the DCO fix as simply as: |
OpenImageIO_ROOT (in case there is a system installed OpenImageIO in the usual places) Signed-off-by: Clifford Stein <cstein@imageworks.com>
cmstein
force-pushed
the
oiio_include_cmake_fixes
branch
from
June 11, 2025 15:13
f5dd54d to
aeaf97b
Compare
lgritz
pushed a commit
to lgritz/OpenShadingLanguage
that referenced
this pull request
Jul 2, 2025
…eFoundation#1997) Adds directives to prioritize the includes from $OpenImageIO_ROOT in case there is an older (or newer!) system install of OpenImageIO. Without this, OSL might use the includes in /usr/include/OpenImageIO yet link to the libraries in OpenImageIO_ROOT thus producing namespace clashes. Signed-off-by: Clifford Stein <cstein@imageworks.com>
lgritz
added
the
build / testing / port / CI
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Adds directives to prioritize the includes from $OpenImageIO_ROOT in case there is an older (or newer!) system install of OpenImageIO. Without this, OSL might use the includes in /usr/include/OpenImageIO yet link to the libraries in OpenImageIO_ROOT thus producing namespace clashes.
Tests
tests pass excdept for '987 - render-microfacet.opt', but I get the same failure for main.
Checklist:
already run clang-format v17 before submitting, I definitely will look at
the CI test that runs clang-format and fix anything that it highlights as
being nonconforming.