[Bf-blender-cvs] [6f1197c6b9e] temp-vulkan-shader: Some tweaks in make file to reduce branching.

[Jeroen Bakker]

Commit: 6f1197c6b9ebeeb2a3db27f1e16cdc91739ca9ce
Author: Jeroen Bakker
Date:   Tue Nov 22 14:11:32 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rB6f1197c6b9ebeeb2a3db27f1e16cdc91739ca9ce

Some tweaks in make file to reduce branching.

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

M	extern/vulkan_memory_allocator/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt

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

diff --git a/extern/vulkan_memory_allocator/CMakeLists.txt b/extern/vulkan_memory_allocator/CMakeLists.txt
index 666fb824322..0b709e8dda1 100644
--- a/extern/vulkan_memory_allocator/CMakeLists.txt
+++ b/extern/vulkan_memory_allocator/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
 
 set(INC_SYS
   ${VULKAN_INCLUDE_DIRS}
-  ${MOLTENVK_INCLUDE_DIRS}
 )
 
 set(SRC
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index abc8640af36..2708b0fe084 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -265,30 +265,27 @@ if(WITH_OPENGL)
   list(APPEND SRC ${OPENGL_SRC})
 endif()
 
+if(WITH_METAL_BACKEND)
+  list(APPEND SRC ${METAL_SRC})
+endif()
+
+set(LIB
+  ${Epoxy_LIBRARIES}
+)
+
 if(WITH_VULKAN_BACKEND)
   list(APPEND SRC ${VULKAN_SRC})
 
+  add_definitions(-DWITH_VULKAN_BACKEND)
+
   list(APPEND INC_SYS
     ${VULKAN_INCLUDE_DIRS}
-    ${MOLTENVK_INCLUDE_DIRS}
   )
 
   list(APPEND INC
     ../../../extern/vulkan_memory_allocator/
   )
 
-  add_definitions(-DWITH_VULKAN_BACKEND)
-endif()
-
-if(WITH_METAL_BACKEND)
-  list(APPEND SRC ${METAL_SRC})
-endif()
-
-set(LIB
-  ${Epoxy_LIBRARIES}
-)
-
-if(WITH_VULKAN_BACKEND)
   list(APPEND LIB
     extern_vulkan_memory_allocator
   )