WIP

CMakeLists.txt

@@ -235,11 +235,11 @@ if (APPLE)
     find_package(Vulkan COMPONENTS MoltenVK REQUIRED)
     set(APP_BUNDLE_CONTENTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/vk-gltf-viewer.app/Contents")
     add_custom_command(TARGET vk-gltf-viewer POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${APP_BUNDLE_CONTENTS_DIR}/Frameworks
-            && ${CMAKE_COMMAND} -E copy ${Vulkan_LIBRARY} ${Vulkan_MoltenVK_LIBRARY} ${APP_BUNDLE_CONTENTS_DIR}/Frameworks
-            && install_name_tool -add_rpath "@executable_path/../Frameworks/" "${APP_BUNDLE_CONTENTS_DIR}/MacOS/vk-gltf-viewer"
-            && otool -L "${APP_BUNDLE_CONTENTS_DIR}/MacOS/vk-gltf-viewer"
-            && install_name_tool -change ${Vulkan_MoltenVK_LIBRARY} "@rpath/libMoltenVK.dylib" "${APP_BUNDLE_CONTENTS_DIR}/MacOS/vk-gltf-viewer")
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${APP_BUNDLE_CONTENTS_DIR}/lib" "${APP_BUNDLE_CONTENTS_DIR}/vulkan"
+            && ${CMAKE_COMMAND} -E copy ${Vulkan_LIBRARY} ${Vulkan_MoltenVK_LIBRARY} "${APP_BUNDLE_CONTENTS_DIR}/lib" # Copy libvulkan.dylib, libMoltenVK.dylib
+            && ${CMAKE_COMMAND} -E rename "${APP_BUNDLE_CONTENTS_DIR}/lib/libvulkan.dylib" "${APP_BUNDLE_CONTENTS_DIR}/lib/libvulkan.1.dylib"
+            && ${CMAKE_COMMAND} -E copy "$ENV{VULKAN_SDK}/../macOS/share/vulkan/icd.d" "${APP_BUNDLE_CONTENTS_DIR}/vulkan"
+            && install_name_tool -add_rpath "@executable_path/../lib/" "${APP_BUNDLE_CONTENTS_DIR}/MacOS/vk-gltf-viewer")
 endif()
 
 # --------------------