diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-05-08 17:40:46 +0300 |
|---|---|---|
| committer | Dominik Schmidt <domme@tomahawk-player.org> | 2018-05-14 14:40:12 +0300 |
| commit | fe5e5fcb3298b215e171921f20fb9e17bd2bf1ff (patch) | |
| tree | f2e1a7b6bced1660f3dfc379b0214c3580407104 /cmake | |
| parent | 0f57326057e1e7e12df8ca9b5070a4434b169863 (diff) | |
Fix for png2ico
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/ECMAddAppIcon.cmake | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cmake/modules/ECMAddAppIcon.cmake b/cmake/modules/ECMAddAppIcon.cmake index e922af68e..51af4ea47 100644 --- a/cmake/modules/ECMAddAppIcon.cmake +++ b/cmake/modules/ECMAddAppIcon.cmake @@ -232,11 +232,11 @@ function(ecm_add_app_icon appsources) set(icotool_icon_arg "") if(size STREQUAL "${maxSize}") # maxSize icon needs to be included as raw png - set(icotool_icon_arg "-r") + list(APPEND icotool_args "-r") endif() foreach(icon ${icons_at_${size}px}) - set(icotool_args "${icotool_args} ${icotool_icon_arg} \"${icons_at_${size}px}\"") + list(APPEND icotool_args "${icons_at_${size}px}") endforeach() endforeach() @@ -245,15 +245,11 @@ function(ecm_add_app_icon appsources) # standard png2ico has no rcfile argument elseif(Png2Ico_FOUND AND NOT Png2Ico_HAS_RCFILE_ARGUMENT AND windows_icons_classic) - set(png2ico_args "\"${_outfilename}.ico\"") + set(png2ico_args) + list(APPEND png2ico_args "${_outfilename}.ico") + list(APPEND png2ico_args "${windows_icons_classic}") - foreach(size 16 24 32 48 64 128) - foreach(icon ${icons_at_${size}px}) - set(png2ico_args "${png2ico_args} \"${icons_at_${size}px}\"") - endforeach() - endforeach() - - create_windows_icon_and_rc(Png2Ico::Png2Ico "${png2ico_args}" "${deps}") + create_windows_icon_and_rc(Png2Ico::Png2Ico "${png2ico_args}" "${windows_icons_classic}") set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE) # png2ico from kdewin provides rcfile argument |