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

Port from master to RB-2.1 - Remove OpenColorIOHeaders target and hardcoded install paths (#1471) #1490

Merged
merged 3 commits into from
Sep 23, 2021

Conversation

hodoulp
Copy link
Member

@hodoulp hodoulp commented Sep 9, 2021

  • Remove OpenColorIOHeaders target

Signed-off-by: Rémi Achard remiachard@gmail.com

  • Avoid hardcoding install paths

Signed-off-by: Rémi Achard remiachard@gmail.com

  • Update remaining hardcoded install paths

Signed-off-by: Rémi Achard remiachard@gmail.com

  • Replace LIB_SUFFIX by CMAKE_INSTALL_LIBDIR

Signed-off-by: Rémi Achard remiachard@gmail.com

Co-authored-by: Patrick Hodoul patrick.hodoul@autodesk.com

* Remove OpenColorIOHeaders target

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Avoid hardcoding install paths

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Update remaining hardcoded install paths

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Replace LIB_SUFFIX by CMAKE_INSTALL_LIBDIR

Signed-off-by: Rémi Achard <remiachard@gmail.com>

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
@remia
Copy link
Collaborator

remia commented Sep 11, 2021

Looks like merging #1488 first will make the test pass @hodoulp ?

@hodoulp
Copy link
Member Author

hodoulp commented Sep 11, 2021

Yes. But the branch merge order in RB-2.1 is PR #1479, then PR #1488, and finally this one.

@hodoulp
Copy link
Member Author

hodoulp commented Sep 23, 2021

Friendly reminder that the pull request can now be merged.

@hodoulp hodoulp merged commit 7ec43b7 into RB-2.1 Sep 23, 2021
@hodoulp hodoulp deleted the adsk_contrib/merge_to_rb21_2 branch September 23, 2021 18: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.

3 participants