From 2a8dd20c081257b3c036e1d7e94557a9ab3ff437 Mon Sep 17 00:00:00 2001 From: Jeremy Kniager Date: Fri, 9 Nov 2018 15:34:16 -0700 Subject: build: Update MoltenVK commit and CMake files Update MoltenVK commit ID in known_good.json and modified CMake files for cube, cubepp, and vulkaninfo to accomidate the new file structure of the MoltenVK repo. Change-Id: I229aa1403b5d1d47060560876b177ae93190391e --- cube/macOS/cubepp/cubepp.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cube/macOS/cubepp') diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake index 3d95d802..2d77f89e 100644 --- a/cube/macOS/cubepp/cubepp.cmake +++ b/cube/macOS/cubepp/cubepp.cmake @@ -74,12 +74,12 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" # Copy the MoltenVK lib into the bundle. if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") add_custom_command(TARGET vkcubepp POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib" + COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/dynamic/libMoltenVK.dylib" ${CMAKE_CURRENT_BINARY_DIR}/$/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib DEPENDS vulkan) else() add_custom_command(TARGET vkcubepp POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib" + COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/dynamic/libMoltenVK.dylib" ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib DEPENDS vulkan) endif() -- cgit v1.2.3