From 56c3d97b5d0985adda007af073db85db346f17b0 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 3 Mar 2008 18:28:53 +0000 Subject: much better way to determine icon size - the last fix was not correct in some cases svn path=/trunk/KDE/kdelibs/; revision=781786 --- modules/KDE4Macros.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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.*") -- cgit v1.2.1