diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2008-03-02 17:16:39 +0000 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2008-03-02 17:16:39 +0000 |
| commit | 591d403123d5b18ddc27fd7b6e4db3b7038223ba (patch) | |
| tree | 95d71bdafbee51a7cccdcf69e77fbf5d289903c0 /modules | |
| parent | 0fe9686d8611717a6f917f952ebd1229c9849f0e (diff) | |
| download | extra-cmake-modules-591d403123d5b18ddc27fd7b6e4db3b7038223ba.tar.gz extra-cmake-modules-591d403123d5b18ddc27fd7b6e4db3b7038223ba.tar.bz2 | |
fix KDE4_ADD_APP_ICON when the path contains '64' or any other needed icon size
svn path=/trunk/KDE/kdelibs/; revision=781336
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/KDE4Macros.cmake | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 68cae0d2..3b9ebc1b 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -1037,21 +1037,22 @@ macro (KDE4_ADD_APP_ICON appsources pattern) if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE) file(GLOB_RECURSE files "${pattern}") FOREACH (it ${files}) - if (it MATCHES ".*16.*" ) + GET_FILENAME_COMPONENT(fn ${it} NAME_WE) + if (fn MATCHES ".*16.*" ) list (APPEND _icons ${it}) - endif (it MATCHES ".*16.*") - if (it MATCHES ".*32.*" ) + endif (fn MATCHES ".*16.*") + if (fn MATCHES ".*32.*" ) list (APPEND _icons ${it}) - endif (it MATCHES ".*32.*") - if (it MATCHES ".*48.*" ) + endif (fn MATCHES ".*32.*") + if (fn MATCHES ".*48.*" ) list (APPEND _icons ${it}) - endif (it MATCHES ".*48.*") - if (it MATCHES ".*64.*" ) + endif (fn MATCHES ".*48.*") + if (fn MATCHES ".*64.*" ) list (APPEND _icons ${it}) - endif (it MATCHES ".*64.*") - if (it MATCHES ".*128.*" ) + endif (fn MATCHES ".*64.*") + if (fn MATCHES ".*128.*" ) list (APPEND _icons ${it}) - endif (it MATCHES ".*128.*") + endif (fn MATCHES ".*128.*") ENDFOREACH (it) if (_icons) set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${target}) |