mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-28 08:10:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'stable-0.8'

Browse Source 
Conflicts:
	src/crashreporter/main.cpp
This commit is contained in:
Dominik Schmidt
2014-10-21 21:41:00 +02:00
parent 73f4c774c3 bb4ad2684c
commit 712c288182
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeModules/AddAppIconMacro.cmake
View File

@@ -12,8 +12,8 @@ SET(WINDRES_EXECUTABLE ${CMAKE_RC_COMPILER})
# adds application icon to target source list
# for detailed documentation see the top of FindKDE4Internal.cmake
macro (KDE4_ADD_APP_ICON appsources pattern)
set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${outfilename})
if (WIN32)
if(NOT WINCE)
@@ -86,9 +86,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
if (_icon)
# first, get the basename of our app icon
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
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}
)
@@ -111,4 +111,4 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
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)
endmacro (KDE4_ADD_APP_ICON)
endmacro (TOMAHAWK_ADD_APP_ICON)