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

Add ShadingSystem attribute "searchpath:library" (similar to searchpa… #1310

Merged

Conversation

AlexMWells
Copy link
Contributor

(similar to searchpath:shader) it will be used to identify directories where target ISA optimized OSL shared libraries may exit.
Make testshade set "searchpath:library" to ../lib64 and ../liboslexec relative to the path testshade is executed from

Description

Tests

Checklist:

  • I have read the contribution guidelines.
  • I have previously submitted a Contributor License Agreement.
  • I have updated the documentation, if applicable.
  • I have ensured that the change is tested somewhere in the testsuite (adding new test cases if necessary).
  • My code follows the prevailing code style of this project.

…th:shader) that is used to identify directories where target ISA optimized OSL shared libraries may exit
Remove testshade command line parameters of "path" and "librarypath" as they were never used and can still be specified with "options".
Remove get_executable_directory() function and use OIIO::Filesystem::parent_path(OIIO::Sysutil::this_program_path())
Change additional relative directory to search for libraries from "/../liboslexec" to "/../lib".
Fix processing of relative directories to be a loop to correctly prefix executable's path.
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.

I made some comments/suggestions

src/testshade/testshade.cpp Outdated Show resolved Hide resolved
src/liboslexec/shadingsys.cpp Show resolved Hide resolved
src/testshade/testshade.cpp Outdated Show resolved Hide resolved
src/testshade/testshade.cpp Outdated Show resolved Hide resolved
@AlexMWells
Copy link
Contributor Author

Changes have been pushed, CI has passed(expect appveyor), so ready for review/approve/merge.

@lgritz lgritz merged commit 5b32bd1 into AcademySoftwareFoundation:master Dec 9, 2020
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