CPack macOS bundle fixes

Author: lainy

CMakeLists.txt

@@ -370,13 +370,14 @@ if(LINUX)
 endif()
 
 if(APPLE)
-    set(CPACK_BUNDLE "ON")
+	set(CPACK_BUNDLE "ON")
+	set(CPACK_GENERATOR "Bundle")
 	set(CPACK_BUNDLE_PLIST "${PROJECT_SOURCE_DIR}/src/ngscopeclient/macos/Info.plist")
 	# Must be generated with:
 	# iconutil -c icns ngscopeclient.iconset
 	set(CPACK_BUNDLE_ICON "${PROJECT_SOURCE_DIR}/src/ngscopeclient/icons/macos/ngscopeclient.icns")
 	set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/src/ngscopeclient/icons/macos/ngscopeclient.icns")
-    set(CPACK_BUNDLE_NAME "ngscopeclient")
+	set(CPACK_BUNDLE_NAME "ngscopeclient")
 	set(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/src/ngscopeclient/macos/ngscopeclient.sh")
 	set_target_properties(ngscopeclient PROPERTIES
 		INSTALL_RPATH "@executable_path/../lib;/usr/local/lib;/opt/homebrew/lib")

src/ngscopeclient/CMakeLists.txt

@@ -269,24 +269,12 @@ endif()
 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 "${MOLTEN_VK_OUTPUT}/lib/libMoltenVK.dylib" DESTINATION lib)
 	install(CODE "
 		include(BundleUtilities)
-		fixup_bundle(\"${APPS}\" \"lib/libMoltenVK.dylib\" \"${DIRS}\")
+		fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\")
 		include(\"${CMAKE_SOURCE_DIR}/src/ngscopeclient/macos/signing.cmake\")
 		")
 endif()