diff options
| author | Oskar Kruschitz <okr@huemer-it.com> | 2018-09-05 12:57:26 +0300 |
|---|---|---|
| committer | Oskar Kruschitz <okr@huemer-it.com> | 2018-09-05 12:57:26 +0300 |
| commit | 2bfb99f174249b3f6f48c386eab7622f81d39e9a (patch) | |
| tree | 0a45cea2d8eadc8c47c266445fd132718ec3547d | |
| parent | e730f95a7155114127a852da452a04c9058fa997 (diff) | |
Mac Application Icon
Replaced ownCloud.icns with APPLICATION_ICON_NAME variable
| -rw-r--r-- | NextcloudCPack.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/MacOSXBundleInfo.plist.in | 2 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/NextcloudCPack.cmake b/NextcloudCPack.cmake index 0a506b945..2edb205e1 100644 --- a/NextcloudCPack.cmake +++ b/NextcloudCPack.cmake @@ -19,7 +19,7 @@ if(APPLE) set( CPACK_GENERATOR "DragNDrop" ) set( CPACK_SOURCE_GENERATOR "") set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} ) - set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns) + set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns) set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in") # set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" ) diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index 5b8f3388a..62e30cbbe 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -11,7 +11,7 @@ <key>CFBundleExecutable</key> <string>@APPLICATION_EXECUTABLE@</string> <key>CFBundleIconFile</key> - <string>ownCloud.icns</string> + <string>@APPLICATION_ICON_NAME@.icns</string> <key>CFBundleIdentifier</key> <string>@APPLICATION_REV_DOMAIN@</string> <key>CFBundleInfoDictionaryVersion</key> diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 05a93f556..4684e9117 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -272,7 +272,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) else() # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf. - set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") + set(MACOSX_BUNDLE_ICON_FILE "${APPLICATION_ICON_NAME}.icns") # we must add MACOSX_BUNDLE only if building a bundle add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) |