-
Notifications
You must be signed in to change notification settings - Fork 351
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
Simplify OSL test setup #1868
Simplify OSL test setup #1868
Conversation
5028309
to
0da86b9
Compare
This is ready to go - pending someone who works on Windows validating that this still allows OSL to be used with windows. |
This proposal looks very promising to me, and I should have a chance to test it soon with Windows OSL (which uses a less standardized build approach and folder structure). |
@ld-kerley In my local test, I get an error message from CMake before I have a chance to select any build options, so this seems to occur even if the user doesn't choose to build with OSL support:
|
@jstone-lucasfilm - was this an error message in CMake, or just a warning and things continued? I would expect things to have just continued, albeit with an annoyingly loud warning. I just pushed a PR where I'm quietening the warning, and also guarding the check to only when we need it (testing OSL). |
…the OSL search path, oslc already knows where the standard headers are located.
… found we'll just fallback to the user provided paths anyway.
99452f6
to
62ecb6b
Compare
@ld-kerley I believe you're correct that this was just a warning, though CMake makes it look as if the warning is fatal through the use of red text. Let me try the latest build and see how things are looking now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me, thanks @ld-kerley!
dd075c0
into
AcademySoftwareFoundation:main
A previous PR #1868 removed the ability to define the location for the OSL standard includes. This is still required for Windows builds.
Use the OSL cmake exports to configure the variables needed to enable OSL testing.
Also remove the need for specifying the standard OSL include path, an
oslc
install will already know where these are.