diff options
| author | John Fultz <jfultz@wolfram.com> | 2019-07-22 01:32:58 -0700 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2019-07-22 01:32:58 -0700 |
| commit | e73218cfb59c0fdd6f08e9f2c577bdd0666fa4f9 (patch) | |
| tree | a8f71eca9b0156cec3d7e63dcf6b040b97c11448 | |
| parent | e29118f4a6e310d879f1bc696f7f4d4e489839fe (diff) | |
Fix .icns file.
Also, fix cmake macOS build to configure the icon.
| -rw-r--r-- | quacker/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | quacker/Info.plist | 2 | ||||
| -rw-r--r-- | quacker/quacker.icns | bin | 40684 -> 249349 bytes |
3 files changed, 12 insertions, 10 deletions
diff --git a/quacker/CMakeLists.txt b/quacker/CMakeLists.txt index a9d070d..f6f617f 100644 --- a/quacker/CMakeLists.txt +++ b/quacker/CMakeLists.txt @@ -80,15 +80,14 @@ set(QUACKLE_HEADERS ) set(QUACKLE_RESOURCES - quacker.icns - ${DATA_ALPHABETS} + "${PROJECT_SOURCE_DIR}/quacker.icns" + # ${DATA_ALPHABETS} ) -message( "${QUACKLE_RESOURCES} ${APPLE} $<1:abc>") if(APPLE AND BUNDLE) add_executable(Quackle MACOSX_BUNDLE - ${QUACKLE_SOURCES} ${QUACKLE_HEADERS} quacker.rc + ${QUACKLE_SOURCES} ${QUACKLE_HEADERS} quacker.icns ) else() add_executable(Quackle @@ -101,12 +100,13 @@ target_link_libraries(Quackle Qt5::Core Qt5::Widgets) if(APPLE) target_link_libraries(Quackle "-framework CoreFoundation") - set_target_properties(Quackle PROPERTIES - $<$<BOOL:${BUNDLE}>: - MACOSX_BUNDLE TRUE - RESOURCE "${QUACKLE_RESOURCES}" - > - ) + if (BUNDLE) + set_target_properties(Quackle + PROPERTIES + RESOURCE ${QUACKLE_RESOURCES} + MACOSX_BUNDLE_INFO_PLIST Info.plist + ) + endif() endif() set_target_properties(Quackle PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Quackle.plist") diff --git a/quacker/Info.plist b/quacker/Info.plist index 36110da..d9a9aa5 100644 --- a/quacker/Info.plist +++ b/quacker/Info.plist @@ -19,6 +19,8 @@ <string>Quackle</string> <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> + <key>CFBundleIconFile</key> + <string>quacker.icns</string> <key>CFBundleIdentifier</key> <string>com.Quackle.Quackle</string> <key>CFBundlePackageType</key> diff --git a/quacker/quacker.icns b/quacker/quacker.icns Binary files differindex 35484da..2f47673 100644 --- a/quacker/quacker.icns +++ b/quacker/quacker.icns |