浏览代码

Merge pull request #13 from yxwangcs/fix-macos-bundle

Fix macOS bundling issue.
Ian Walton 4 年之前
父节点
当前提交
31bd38dda2
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 4
      CMakeModules/CompleteBundleOSX.cmake.in
  2. 1 0
      src/CMakeLists.txt

+ 1 - 4
CMakeModules/CompleteBundleOSX.cmake.in

@@ -1,9 +1,6 @@
 set(app "${CMAKE_INSTALL_PREFIX}/@EXE@")
 set(weprocess "${app}/Contents/Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app")
 
-list(APPEND BINS "Contents/Resources/updater")
-list(APPEND BINS "Contents/Resources/@HELPER_NAME@")
-
 set(args ${app})
 list(APPEND args "-verbose=2")
 list(APPEND args "-qmldir=@SOURCE_ROOT@/src/ui")
@@ -16,7 +13,7 @@ set(ENV{DYLD_FRAMEWORK_PATH} @QTROOT@/lib:@DEPENDENCY_ROOT@/lib)
 
 execute_process(
   COMMAND ${CMAKE_COMMAND} -E remove "${app}/Contents/Resources/qt.conf"
-  COMMAND "@QTROOT@/bin/macdeployqt" ${args}
+  COMMAND "@QTROOT@/bin/macdeployqt" ${args} "-dmg"
   WORKING_DIRECTORY "@QTROOT@/bin"
 )
 

+ 1 - 0
src/CMakeLists.txt

@@ -108,6 +108,7 @@ endif()
 set(RESOURCE_ROOT .)
 if(APPLE)
   set(RESOURCE_ROOT Resources)
+  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
 endif()
 
 if(NOT APPLE)