CMake: quiet undefined variable use with MOLTENVK on non-apple systems

This commit is contained in:
Campbell Barton 2023-10-07 18:25:44 +11:00
parent b434d40dbf
commit 126cf64004
3 changed files with 31 additions and 5 deletions

View File

@ -8,9 +8,14 @@ set(INC
set(INC_SYS
${VULKAN_INCLUDE_DIRS}
${MOLTENVK_INCLUDE_DIRS}
)
if(APPLE)
list(APPEND INC_SYS
${MOLTENVK_INCLUDE_DIRS}
)
endif()
set(SRC
vk_mem_alloc_impl.cc

View File

@ -82,6 +82,17 @@ if(WITH_OPENGL_BACKEND)
endif()
if(WITH_VULKAN_BACKEND)
if(APPLE)
list(APPEND INC_SYS
PUBLIC ${MOLTENVK_INCLUDE_DIRS}
)
list(APPEND LIB
${MOLTENVK_LIBRARIES}
)
endif()
list(APPEND SRC
intern/GHOST_ContextVK.cc
@ -90,12 +101,10 @@ if(WITH_VULKAN_BACKEND)
list(APPEND INC_SYS
PUBLIC ${VULKAN_INCLUDE_DIRS}
PUBLIC ${MOLTENVK_INCLUDE_DIRS}
)
list(APPEND LIB
${VULKAN_LIBRARIES}
${MOLTENVK_LIBRARIES}
)
add_definitions(-DWITH_VULKAN_BACKEND)

View File

@ -342,12 +342,25 @@ endif()
if(WITH_VULKAN_BACKEND)
if(APPLE)
list(APPEND INC_SYS
${MOLTENVK_INCLUDE_DIRS}
)
list(APPEND LIB
${MOLTENVK_LIBRARIES}
)
endif()
list(APPEND INC
../../../extern/vulkan_memory_allocator
)
list(APPEND INC_SYS
${VULKAN_INCLUDE_DIRS}
${MOLTENVK_INCLUDE_DIRS}
)
list(APPEND INC_SYS
${SHADERC_INCLUDE_DIRS}
)
list(APPEND SRC
@ -357,7 +370,6 @@ if(WITH_VULKAN_BACKEND)
list(APPEND LIB
${VULKAN_LIBRARIES}
${SHADERC_LIBRARIES}
${MOLTENVK_LIBRARIES}
extern_vulkan_memory_allocator
)