瀏覽代碼

Restore OSX app icon

I have no idea why this regressed?
Vincent Lang 8 年之前
父節點
當前提交
738104babb
共有 1 個文件被更改,包括 10 次插入6 次删除
  1. 10 6
      src/CMakeLists.txt

+ 10 - 6
src/CMakeLists.txt

@@ -88,6 +88,12 @@ set_source_files_properties(qrc_resources.cpp PROPERTIES GENERATED TRUE)
 
 list(APPEND RESOURCE_FILES qrc_resources.cpp)
 
+set(MACOSX_BUNDLE_ICON_FILE Plex.icns)
+set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION_STRING})
+set(MACOSX_BUNDLE_BUNDLE_NAME "Plex Media Player")
+set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION_STRING})
+set(MACOSX_BUNDLE_GUI_IDENTIFIER tv.plex.player)
+
 if(APPLE)
   if(HAVE_UPDATER)
     add_resources(TARGET ${MAIN_TARGET} SOURCES ${UPDATER_PATH} DEST ${INSTALL_RESOURCE_DIR})
@@ -104,13 +110,11 @@ if(APPLE)
   endif()
 
   set(PLISTPARSER plistparser)
-endif()
 
-set(MACOSX_BUNDLE_ICON_FILE Plex.icns)
-set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION_STRING})
-set(MACOSX_BUNDLE_BUNDLE_NAME "Plex Media Player")
-set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION_STRING})
-set(MACOSX_BUNDLE_GUI_IDENTIFIER tv.plex.player)
+  set(ICON_FILE ${CMAKE_SOURCE_DIR}/bundle/osx/${MACOSX_BUNDLE_ICON_FILE})
+  list(APPEND RESOURCE_FILES ${ICON_FILE})
+  set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+endif()
 
 if(WIN32)
   list(APPEND RESOURCE_FILES ${CMAKE_SOURCE_DIR}/bundle/win/iconres.rc)