diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-02-17 20:28:12 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-17 20:28:12 +0300 |
commit | 8d60e6fa387891dd3879183b502e636e1e86b594 (patch) | |
tree | 3f321f08b2b944e12a29c92a29561acd4c1f8e59 /build_files/cmake/platform/platform_win32.cmake | |
parent | a33b261473e95de8d8d438dbb6aa7afe513fb082 (diff) |
Fix: T73830 OSL not finding stdosl.h on linux
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.
Differential Revision: https://developer.blender.org/D6865
Reviewers: brecht
Diffstat (limited to 'build_files/cmake/platform/platform_win32.cmake')
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index cfa4f1c9bf7..0c1374af348 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -607,7 +607,7 @@ endif() if(WITH_CYCLES_OSL) set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation") - + set(OSL_SHADER_DIR ${CYCLES_OSL}/shaders) find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib) find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib) find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib) |