[Bf-blender-cvs] [421ce37f9c1] blender-v2.83-release: Fix T78065: OSL shader compilation fails on macOS

Brecht Van Lommel noreply at git.blender.org
Wed Aug 26 11:57:24 CEST 2020


Commit: 421ce37f9c16e8489814eb3ce6bb03b7cf64aeef
Author: Brecht Van Lommel
Date:   Thu Aug 13 17:39:28 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB421ce37f9c16e8489814eb3ce6bb03b7cf64aeef

Fix T78065: OSL shader compilation fails on macOS

===================================================================

M	build_files/cmake/platform/platform_apple.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index d8ee82d4c10..47e5b807be5 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -369,8 +369,9 @@ if(WITH_CYCLES_OSL)
   list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
   find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
   find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+  find_path(OSL_SHADER_DIR NAMES stdosl.h PATHS ${CYCLES_OSL}/shaders)
 
-  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
+  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER AND OSL_SHADER_DIR)
     set(OSL_FOUND TRUE)
   else()
     message(STATUS "OSL not found")



More information about the Bf-blender-cvs mailing list