diff options
| author | Jeremy Kniager <jeremyk@lunarg.com> | 2018-11-09 15:34:16 -0700 |
|---|---|---|
| committer | jeremyk-lunarg <jeremyk@lunarg.com> | 2018-11-13 11:52:40 -0700 |
| commit | 2a8dd20c081257b3c036e1d7e94557a9ab3ff437 (patch) | |
| tree | 3224920610d1bcdd8472d5663a94506e3d1ed53a /cube/macOS/cubepp | |
| parent | f08e327b161dbb96223bf1687c7304096e63c064 (diff) | |
| download | usermoji-2a8dd20c081257b3c036e1d7e94557a9ab3ff437.tar.xz | |
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
Diffstat (limited to 'cube/macOS/cubepp')
| -rw-r--r-- | cube/macOS/cubepp/cubepp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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}/$<CONFIG>/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() |