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

Author: azonenberg

.github/workflows/build-macos-intel.yml

@@ -91,6 +91,12 @@ jobs:
         cd build
         ninja
 
+    - name: Build Package
+      if: ${{ ! matrix.docs }}
+      run: |
+        cd build
+        cpack -G Bundle
+
     - name: Run Tests
       if: ${{ false }} # Metal is not available on GH macOS runners
       run: |
@@ -107,3 +113,9 @@ jobs:
           build/src/ngscopeclient/shaders/*
           build/lib/scopehal/libscopehal.dylib
           build/lib/scopeprotocols/libscopeprotocols.dylib
+
+    - name: Upload Package
+      uses: actions/upload-artifact@v4
+      with:
+        name: ngscopeclient-${{ runner.os }}-${{ github.job }}-package
+        path: build/*.dmg

src/ngscopeclient/CMakeLists.txt

@@ -253,10 +253,20 @@ if(APPLE)
 	set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/ngscopeclient")
 	set(DIRS "\${CMAKE_INSTALL_PREFIX}/lib")
 	set(FRAMEWORKS "\${CMAKE_INSTALL_PREFIX}/Frameworks")
+	execute_process(
+		COMMAND brew --prefix molten-vk
+		RESULT_VARIABLE MOLTEN_VK_RESULT
+		OUTPUT_VARIABLE MOLTEN_VK_OUTPUT
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	if(NOT MOLTEN_VK_RESULT EQUAL 0)
+		message(FATAL_ERROR "failed to find Homebrew prefix for molten-vk")
+	endif()
 	# 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(FILES "${MOLTEN_VK_OUTPUT}/lib/libMoltenVK.dylib" DESTINATION lib)
 	install(CODE "
 		include(BundleUtilities)
 		fixup_bundle(\"${APPS}\" \"lib/libMoltenVK.dylib\" \"${DIRS}\")