Vulkan: Tweaks to CMake configuration.
MoltenVK wasn't found as it was previous part of lib/vulkan. as lib/vulkan now doesn't contain the full sdk, we will use a moltenvk folder. At this moment the moltenvk folder isn't filled, but will eventually be.
This commit is contained in:
parent
b67b84bd5d
commit
e99ae0a75d
@ -24,7 +24,7 @@ SET(_moltenvk_SEARCH_DIRS
|
|||||||
# FIXME: These finder modules typically don't use LIBDIR,
|
# FIXME: These finder modules typically don't use LIBDIR,
|
||||||
# this should be set by `./build_files/cmake/platform/` instead.
|
# this should be set by `./build_files/cmake/platform/` instead.
|
||||||
IF(DEFINED LIBDIR)
|
IF(DEFINED LIBDIR)
|
||||||
SET(_moltenvk_SEARCH_DIRS ${_moltenvk_SEARCH_DIRS} ${LIBDIR}/vulkan/MoltenVK)
|
SET(_moltenvk_SEARCH_DIRS ${_moltenvk_SEARCH_DIRS} ${LIBDIR}/moltenvk)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
FIND_PATH(MOLTENVK_INCLUDE_DIR
|
FIND_PATH(MOLTENVK_INCLUDE_DIR
|
||||||
|
@ -100,12 +100,14 @@ if(WITH_VULKAN_BACKEND)
|
|||||||
|
|
||||||
if(EXISTS ${LIBDIR}/vulkan)
|
if(EXISTS ${LIBDIR}/vulkan)
|
||||||
set(VULKAN_FOUND On)
|
set(VULKAN_FOUND On)
|
||||||
set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan/macOS)
|
set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan)
|
||||||
set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
|
set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
|
||||||
set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/libvulkan.1.dylib)
|
set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/libvulkan.dylib)
|
||||||
set(SHADERC_LIBRARY ${VULKAN_ROOT_DIR}/lib/libshaderc_combined.a)
|
set(SHADERC_ROOT_DIR ${LIBDIR}/shaderc)
|
||||||
|
set(SHADERC_INCLUDE_DIR ${SHADERC_ROOT_DIR}/include)
|
||||||
|
set(SHADERC_LIBRARY ${SHADERC_ROOT_DIR}/lib/libshaderc_combined.a)
|
||||||
|
|
||||||
set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR} ${MOLTENVK_INCLUDE_DIRS})
|
set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR} ${SHADERC_INCLUDE_DIR} ${MOLTENVK_INCLUDE_DIRS})
|
||||||
set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${SHADERC_LIBRARY} ${MOLTENVK_LIBRARIES})
|
set(VULKAN_LIBRARIES ${VULKAN_LIBRARY} ${SHADERC_LIBRARY} ${MOLTENVK_LIBRARIES})
|
||||||
else()
|
else()
|
||||||
message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
|
message(WARNING "Vulkan SDK was not found, disabling WITH_VULKAN_BACKEND")
|
||||||
|
Loading…
Reference in New Issue
Block a user