[Bf-blender-cvs] [a2ee7e820ba] tmp-vfx-platform-2023: Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

[Ray Molenkamp]

Commit: a2ee7e820ba580fc9f6e75f35d5b577946ee1434
Author: Ray Molenkamp
Date:   Mon Dec 5 08:24:33 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rBa2ee7e820ba580fc9f6e75f35d5b577946ee1434

Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

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



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

diff --cc build_files/cmake/platform/platform_apple.cmake
index fca0c3a06c5,31171d083c1..db5fd54cd7b
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@@ -86,16 -98,24 +86,33 @@@ endif(
  
  if(WITH_USD)
    find_package(USD REQUIRED)
 +  add_bundled_libraries(usd/lib)
 +endif()
 +
 +if(WITH_MATERIALX)
 +  find_package(MaterialX)
 +  set_and_warn_library_found("MaterialX" MaterialX_FOUND WITH_MATERIALX)
 +  if(WITH_MATERIALX)
 +    add_bundled_libraries(materialx/lib)
 +  endif()
  endif()
+ 
+ if(WITH_VULKAN_BACKEND)
+   find_package(MoltenVK REQUIRED)
+ 
+   if(EXISTS ${LIBDIR}/vulkan)
+     set(VULKAN_FOUND On)
+     set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan/macOS)
+     set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
+     set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/libvulkan.1.dylib)
+ 
+     set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR} ${MOLTENVK_INCLUDE_DIRS})
+     set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${MOLTENVK_LIBRARIES})
+   else()
+     message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
+     set(WITH_VULKAN_BACKEND OFF)
+   endif()
+ endif()
  
  if(WITH_OPENSUBDIV)
    find_package(OpenSubdiv)