diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-05-28 21:25:14 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-05-28 21:25:14 +0000 |
| commit | e65f9036bf2776fac40102a093a1c134867eaa72 (patch) | |
| tree | 64db88054bf666d045beb962d8dfc18bb52c616a | |
| parent | ea15a691f07e83c7b1251a96e3757b1e26e7469c (diff) | |
| download | extra-cmake-modules-e65f9036bf2776fac40102a093a1c134867eaa72.tar.gz extra-cmake-modules-e65f9036bf2776fac40102a093a1c134867eaa72.tar.bz2 | |
-also list the tiff file as output
-the OUTPUT files are deleted automatically on "make clean", so no need to add them explicitely
Alex
svn path=/trunk/KDE/kdelibs/; revision=813894
| -rw-r--r-- | modules/KDE4Macros.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index b7eb6ad7..8f96c194 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -1096,7 +1096,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern) message(STATUS "Unable to find the png2ico or windres utilities - application will not have an application icon!") endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE) endif(WIN32) - if (Q_WS_MAC) + if (APPLE) # first convert image to a tiff using the Mac OS X "sips" utility, # then use tiff2icns to convert to an icon find_program(SIPS_EXECUTABLE NAMES sips) @@ -1114,14 +1114,12 @@ macro (KDE4_ADD_APP_ICON appsources pattern) if (_icon) # first, get the basename of our app icon - add_custom_command(OUTPUT ${_outfilename}.icns + add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns DEPENDS ${_icon} ) - macro_additional_clean_files(${outfilename}.tiff ${_outfilename}.icns) - # This will register the icon into the bundle set(MACOSX_BUNDLE_ICON_FILE ${target}.icns) @@ -1142,7 +1140,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern) else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!") endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) - endif(Q_WS_MAC) + endif(APPLE) endmacro (KDE4_ADD_APP_ICON) |