[Bf-blender-cvs] [1effef805e0] temp-vulkan-shader: Merge branch 'master' into temp-vulkan-shader

[Jeroen Bakker]

Commit: 1effef805e01e25c9e569f92fd151fa8eacd62b2
Author: Jeroen Bakker
Date:   Tue Nov 22 14:19:26 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rB1effef805e01e25c9e569f92fd151fa8eacd62b2

Merge branch 'master' into temp-vulkan-shader

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



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

diff --cc build_files/cmake/platform/platform_apple.cmake
index 3f1b87ec0b0,31171d083c1..37a3ac79c0f
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@@ -105,16 -107,14 +107,15 @@@ if(WITH_VULKAN_BACKEND
      set(VULKAN_FOUND On)
      set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan/macOS)
      set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
-     set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR})
      set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/libvulkan.1.dylib)
 +    set(SHADERC_LIBRARY ${VULKAN_ROOT_DIR}/lib/libshaderc_combined.a)
-     set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${SHADERC_LIBRARY})
+ 
+     set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR} ${MOLTENVK_INCLUDE_DIRS})
 -    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${MOLTENVK_LIBRARIES})
++    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${SHADERC_LIBRARY} ${MOLTENVK_LIBRARIES})
    else()
-     message(WARNING "Vulkan was not found, disabling WITH_VULKAN_BACKEND")
+     message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
      set(WITH_VULKAN_BACKEND OFF)
    endif()
- 
-   find_package(MoltenVK REQUIRED)
  endif()
  
  if(WITH_OPENSUBDIV)