Fix: T73830 OSL not finding stdosl.h on linux
ClosedPublic
Actions

Authored by Ray Molenkamp (LazyDodo) on Feb 16 2020, 10:07 PM.

Details

Reviewers

Commits

rC94b2c5c86b0b: Fix: T73830 OSL not finding stdosl.h on linux
rB8d60e6fa3878: Fix: T73830 OSL not finding stdosl.h on linux

Summary

This extends FindOpenShadingLanguage.cmake to also look for the location of
stdosl.h and adds the path to the invocation of oslc to deal with the headers
being in different locations a little better.

Tested on WSL

Diff Detail

Repository

rB Blender

Branch

tmp_osl_fix (branched from master)

Build Status

Buildable 6646
Build 6646: arc lint + arc unit

Event Timeline

Ray Molenkamp (LazyDodo) created this revision.Feb 16 2020, 10:07 PM

Harbormaster completed remote builds in B6646: Diff 21776.Feb 16 2020, 10:07 PM

Ray Molenkamp (LazyDodo) mentioned this in T73830: Blender complains that it cannot find "stdosl.h", despite it existing at "/usr/share/OSL/shaders/stdosl.h".Feb 16 2020, 10:08 PM

quote the shader dir incase there are spaces in it

Harbormaster completed remote builds in B6647: Diff 21777.Feb 16 2020, 10:10 PM

Thanks!

This revision is now accepted and ready to land.Feb 17 2020, 9:08 AM

Closed by commit rB8d60e6fa3878: Fix: T73830 OSL not finding stdosl.h on linux (authored by Ray Molenkamp (LazyDodo)). · Explain WhyFeb 17 2020, 6:55 PM

This revision was automatically updated to reflect the committed changes.

Ray Molenkamp (LazyDodo) added a commit: rB8d60e6fa3878: Fix: T73830 OSL not finding stdosl.h on linux.

Brecht Van Lommel (brecht) added a commit: rC94b2c5c86b0b: Fix: T73830 OSL not finding stdosl.h on linux.Jun 2 2020, 7:36 AM

howetuft (howetuft) mentioned this in rC94b2c5c86b0b: Fix: T73830 OSL not finding stdosl.h on linux.Jun 12 2020, 11:30 PM

howetuft (howetuft) mentioned this in D8018: Cycles Standalone: Fix: T73830 OSL not finding stdosl.h on linux.Jun 13 2020, 5:56 PM

Revision Contents
Changeset List

Path

Size

build_files/

cmake/

Modules/

FindOpenShadingLanguage.cmake

16 lines

platform/

platform_win32.cmake

2 lines

intern/

cycles/

kernel/

shaders/

CMakeLists.txt

11 lines

Diff 21776

View Options

build_files/cmake/Modules/FindOpenShadingLanguage.cmake

View Options

build_files/cmake/platform/platform_win32.cmake

View Options

intern/cycles/kernel/shaders/CMakeLists.txt

Fix: T73830 OSL not finding stdosl.h on linuxClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 21776

build_files/cmake/Modules/FindOpenShadingLanguage.cmake

build_files/cmake/platform/platform_win32.cmake

intern/cycles/kernel/shaders/CMakeLists.txt

Fix: T73830 OSL not finding stdosl.h on linux
ClosedPublic
Actions

Revision Contents
Changeset List