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

Adsk Contrib - Better manage Imath dependency #1478

Merged
merged 3 commits into from
Sep 8, 2021

Conversation

hodoulp
Copy link
Member

@hodoulp hodoulp commented Sep 2, 2021

Signed-off-by: Patrick Hodoul Patrick.Hodoul@autodesk.com

Using Imath in the library could sometime conflict with the Imath from OpenImageIO. When you try on ubuntu 20.04 using the system OpenImageIO the compilation of OpenColorIO fails because of symbol clashes on Imath (i.e. 3.1.x from OpenColorIO 2.1.x vs. 3.0.x expected by OpenImageIO 2.1.x).

The pull request changes the code to use the OpenImageIO one for apps using OpenImageIO. I also removed some useless Imath dependencies.

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
@hodoulp
Copy link
Member Author

hodoulp commented Sep 2, 2021

I did my tests on ubuntu 20.04 and macOS.

Copy link
Collaborator

@lgritz lgritz left a comment

Choose a reason for hiding this comment

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

lgtm

@hodoulp
Copy link
Member Author

hodoulp commented Sep 3, 2021

The PR is a candidate for RB-2.1

Signed-off-by: hodoulp <Patrick.Hodoul@autodesk.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
@hodoulp hodoulp mentioned this pull request Sep 8, 2021
Copy link
Collaborator

@doug-walker doug-walker left a comment

Choose a reason for hiding this comment

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

Approving immediately since this bug fix is needed to unbreak the CI builds.

@hodoulp hodoulp merged commit 959b3f7 into master Sep 8, 2021
@hodoulp hodoulp deleted the adsk_contrib/imath_usage_changes branch September 8, 2021 11:57
hodoulp added a commit that referenced this pull request Sep 8, 2021
* Adsk Contrib - Better manage Imath dependency

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>

* Add the OpenImageIO_Util dependency to OSL unit test framework

Signed-off-by: hodoulp <Patrick.Hodoul@autodesk.com>

* Fix oiio typo

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
hodoulp added a commit that referenced this pull request Sep 21, 2021
* Adsk Contrib - Better manage Imath dependency

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>

* Add the OpenImageIO_Util dependency to OSL unit test framework

Signed-off-by: hodoulp <Patrick.Hodoul@autodesk.com>

* Fix oiio typo

Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>
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.

None yet

4 participants