CMake/deps: Adjust OSL shader directory
ClosedPublic
Actions

Authored by Sebastián Barschkis (sebbas) on Feb 26 2021, 9:14 PM.

Details

Reviewers

Sybren A. Stüvel (sybren)
Ray Molenkamp (LazyDodo)

Commits

rBe00a87163cfd: CMake/deps: Adjust OSL shader directory

Summary

The location of the shaders changed with OSL 1.11.10. This commit is therefore in addition to D10212.

@Sybren A. Stüvel (sybren) With the latest SVN libraries, I am fairly certain there is a "OSL not found" in the CMake output. Can you check on Linux?

@Ray Molenkamp (LazyDodo) Since you haven't pushed the new OSL libs yet, this should not be a problem on Windows. So this will only be needed whenever those land.

Diff Detail

Repository

rB Blender

Branch

osl_shaders_fix (branched from master)

Build Status

Buildable 13137
Build 13137: arc lint + arc unit

Event Timeline

Sebastián Barschkis (sebbas) requested review of this revision.Feb 26 2021, 9:14 PM

Sebastián Barschkis (sebbas) created this revision.

Harbormaster completed remote builds in B13137: Diff 34471.Feb 26 2021, 9:14 PM

Okay, this patch is actually just for me :)

@Ray Molenkamp (LazyDodo) Scratch that. I saw that platform_win32.cmake has a nice way to find shaders.

@Sybren A. Stüvel (sybren) Maybe just check that shaders are actually found.

windows checks since it has to support both the old and new lib set, since committing the new libs may take anywhere between 2 and 24 hours and i can't guaranteed be there to land the platform changes on time, so I went on the offensive and support both styles so i can walk away while SVN does its thing.

also think linux uses findosl.cmake and it was already looking in the new location

Ray Molenkamp (LazyDodo) accepted this revision.Feb 26 2021, 9:34 PM

This revision is now accepted and ready to land.Feb 26 2021, 9:34 PM

Closed by commit rBe00a87163cfd: CMake/deps: Adjust OSL shader directory (authored by Sebastián Barschkis (sebbas)). · Explain WhyFeb 26 2021, 9:36 PM

This revision was automatically updated to reflect the committed changes.

Sebastián Barschkis (sebbas) added a commit: rBe00a87163cfd: CMake/deps: Adjust OSL shader directory.