diff options
| author | Patrick Spendrin <ps_ml@gmx.de> | 2007-11-09 16:46:13 +0000 |
|---|---|---|
| committer | Patrick Spendrin <ps_ml@gmx.de> | 2007-11-09 16:46:13 +0000 |
| commit | 8d159c824aae855ac93e5f383fd75f0a3485db49 (patch) | |
| tree | 9f34a2d236b797b6b197e18fde95d7e01577e5fe | |
| parent | 25b815e8dadc69adc91dc3395f0da6af42cebf56 (diff) | |
| download | extra-cmake-modules-8d159c824aae855ac93e5f383fd75f0a3485db49.tar.gz extra-cmake-modules-8d159c824aae855ac93e5f383fd75f0a3485db49.tar.bz2 | |
hopefully the last commit concerning this
svn path=/trunk/KDE/kdelibs/; revision=734696
| -rw-r--r-- | modules/KDE4Macros.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 376201f3..9108d24d 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -942,10 +942,11 @@ endmacro (KDE4_CREATE_HTML_HANDBOOK) # adds application icon to target source list #'appname' - an application name +# 'appsources' - the sources of the application # 'pngfiles' - specifies the list of icon files # example: KDE4_ADD_WIN32_APP_ICON(myapp "pics/cr16-myapp.png;pics/cr32-myapp.png") -macro (KDE4_ADD_WIN32_APP_ICON appname pngfiles) +macro (KDE4_ADD_WIN32_APP_ICON appname appsources pngfiles) if (WIN32) if (NOT PNG2ICO_EXECUTABLE) find_program(PNG2ICO_EXECUTABLE NAMES png2ico) @@ -965,6 +966,9 @@ macro (KDE4_ADD_WIN32_APP_ICON appname pngfiles) if (MINGW) exec_program(windres ARGS "-i ${_outfilename}.rc -o ${_outfilename}_res.o --include-dir=${CMAKE_CURRENT_SOURCE_DIR}") + list(APPEND ${appsources} ${CMAKE_CURRENT_BINARY_DIR}/${appname}_res.o) + else(MINGW) + list(APPEND ${appsources} ${CMAKE_CURRENT_BINARY_DIR}/${appname}.rc) endif(MINGW) endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE) endif(WIN32) |