Merge branch 'master' of github.com:ngscopeclient/scopehal-apps

Author: azonenberg

src/ngscopeclient/CMakeLists.txt

@@ -253,9 +253,13 @@ if(APPLE)
 	set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/ngscopeclient")
 	set(DIRS "\${CMAKE_INSTALL_PREFIX}/lib")
 	set(FRAMEWORKS "\${CMAKE_INSTALL_PREFIX}/Frameworks")
+	# https://vulkan.lunarg.com/doc/view/1.3.275.0/mac/getting_started.html#application-bundle-structure-on-macos
+	install(FILES "${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/MoltenVK_icd.json"
+		DESTINATION bin/vulkan/icd.d/)
+	install(FILES "/opt/homebrew/opt/molten-vk/lib/libMoltenVK.dylib" DESTINATION lib)
 	install(CODE "
 		include(BundleUtilities)
-		fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\")
+		fixup_bundle(\"${APPS}\" \"lib/libMoltenVK.dylib\" \"${DIRS}\")
 		include(\"${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/signing.cmake\")
 		")
 endif()

src/ngscopeclient/macos/MoltenVK_icd.json

@@ -0,0 +1,8 @@
+{
+    "file_format_version": "1.0.0",
+    "ICD": {
+        "library_path": "../../lib/libMoltenVK.dylib",
+        "api_version": "1.3.0",
+        "is_portability_driver": true
+    }
+}

src/ngscopeclient/macos/ngscopeclient.sh

@@ -4,6 +4,8 @@ BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/ngscopeclient//'`"
 RESOURCES="$BUNDLE/Contents/Resources"
 
 export "PATH=$RESOURCES/bin:$PATH"
+#HACK: no clue why install_name_tool isn't fixing this...
+export DYLD_LIBRARY_PATH="$RESOURCES/lib:$RESOURCES/Frameworks:${DYLD_LIBRARY_PATH}"
 
 exec "$RESOURCES/bin/ngscopeclient" $*
 

src/ngscopeclient/macos/signing.cmake

@@ -4,6 +4,9 @@ endif()
 
 get_filename_component(APP_BUNDLE "${CMAKE_INSTALL_PREFIX}/../.." ABSOLUTE)
 
+message(STATUS "Running chmod 755 for all dylibs")
+execute_process(COMMAND find "${APP_BUNDLE}" -type f -name "*.dylib" -exec chmod 755 {} \;)
+
 message(STATUS "Signing all dylibs")
 execute_process(COMMAND find "${APP_BUNDLE}" -type f -name "*.dylib" -exec codesign --force -s "${SIGNING_IDENTITY}" {} \;)