aboutsummaryrefslogtreecommitdiff
path: root/modules/KDE4Macros.cmake
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2008-03-03 18:28:53 +0000
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2008-03-03 18:28:53 +0000
commit56c3d97b5d0985adda007af073db85db346f17b0 (patch)
tree4b09c11ef7fc90b32a5a9e2f521b31c2062a663e /modules/KDE4Macros.cmake
parent591d403123d5b18ddc27fd7b6e4db3b7038223ba (diff)
downloadextra-cmake-modules-56c3d97b5d0985adda007af073db85db346f17b0.tar.gz
extra-cmake-modules-56c3d97b5d0985adda007af073db85db346f17b0.tar.bz2
much better way to determine icon size - the last fix was not correct in some cases
svn path=/trunk/KDE/kdelibs/; revision=781786
Diffstat (limited to 'modules/KDE4Macros.cmake')
-rw-r--r--modules/KDE4Macros.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 3b9ebc1b..b4de12eb 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -1035,9 +1035,10 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
set(WINDRES_EXECUTABLE TRUE)
endif(MSVC)
if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
+ STRING(REPLACE "*" "(.*)" pattern_rx "${pattern}")
file(GLOB_RECURSE files "${pattern}")
FOREACH (it ${files})
- GET_FILENAME_COMPONENT(fn ${it} NAME_WE)
+ STRING(REGEX REPLACE "${pattern_rx}" "\\1" fn "${it}")
if (fn MATCHES ".*16.*" )
list (APPEND _icons ${it})
endif (fn MATCHES ".*16.*")