[Uml-devel] KDE/kdesdk

[Christian Ehrlicher]

SVN commit 755087 by chehrlic:

kde4_add_win32_app_icon -> kde4_add_app_icon

 M  +5 -8      kate/app/CMakeLists.txt  
 M  +1 -8      umbrello/umbrello/CMakeLists.txt  


--- trunk/KDE/kdesdk/kate/app/CMakeLists.txt #755086:755087
@@ -40,16 +40,13 @@
 
 if (WIN32)
     configure_file(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/kate_dummy.cpp)
+
     list(APPEND kate_KDEINIT_SRCS ${CMAKE_CURRENT_BINARY_DIR}/kate_dummy.cpp)
-    set(kate_icons
-        ${KDE4_INSTALL_DIR}/share/icons/oxygen/16x16/apps/kate.png
-        ${KDE4_INSTALL_DIR}/share/icons/oxygen/32x32/apps/kate.png
-        ${KDE4_INSTALL_DIR}/share/icons/oxygen/48x48/apps/kate.png
-        ${KDE4_INSTALL_DIR}/share/icons/oxygen/64x64/apps/kate.png
-        ${KDE4_INSTALL_DIR}/share/icons/oxygen/128x128/apps/kate.png
-    )
-    kde4_add_win32_app_icon(kate_KDEINIT_SRCS ${kate_icons})
+
+    kde4_add_app_icon(kate_KDEINIT_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/kate.png")
+
     kde4_add_executable(kate ${kate_KDEINIT_SRCS} )
+
     target_link_libraries( kate ${QT_QTMAIN_LIBRARY} ${KDE4_KDECORE_LIBS} kateinterfaces )
 else (WIN32)
     kde4_add_kdeinit_executable( kate ${kate_KDEINIT_SRCS})
--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #755086:755087
@@ -388,14 +388,6 @@
     set (libcmds_SRCS)
 
     set (LIBS codeimport dialogs generators docgenerator cmds)
-    set(umbrello_icons
-        ${CMAKE_CURRENT_SOURCE_DIR}/hi16-app-umbrello.png 
-        ${CMAKE_CURRENT_SOURCE_DIR}/hi32-app-umbrello.png 
-        ${CMAKE_CURRENT_SOURCE_DIR}/hi48-app-umbrello.png 
-        ${CMAKE_CURRENT_SOURCE_DIR}/hi64-app-umbrello.png 
-        ${CMAKE_CURRENT_SOURCE_DIR}/hi128-app-umbrello.png 
-    )
-    kde4_add_win32_app_icon(umbrello_SRCS ${umbrello_icons})
 
 else (WIN32)
     set (LIBS )
@@ -416,6 +408,7 @@
 	${libumbrello_SRCS}
 )
 
+kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-umbrello.png")
 kde4_add_executable(umbrello ${umbrello_SRCS})
 target_link_libraries(umbrello  ${LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )
 install(TARGETS umbrello DESTINATION ${BIN_INSTALL_DIR} )