mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

Add outfilename parameter to KDE4_ADD_APP_ICON and rename it to TOMAHAWK_ADD_APP_ICON because it's not compatible anymore

Browse Source
This commit is contained in:
Dominik Schmidt
2014-10-21 21:22:50 +02:00
parent b1537607b2
commit bb4ad2684c
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/AddAppIconMacro.cmake
View File

@@ -12,8 +12,8 @@ SET(WINDRES_EXECUTABLE ${CMAKE_RC_COMPILER})
# adds application icon to target source list # adds application icon to target source list
# for detailed documentation see the top of FindKDE4Internal.cmake # for detailed documentation see the top of FindKDE4Internal.cmake
macro (KDE4_ADD_APP_ICON appsources pattern) macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources}) set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${outfilename})
if (WIN32) if (WIN32)
if(NOT WINCE) if(NOT WINCE)
@@ -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!") message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
endif(Q_WS_MAC) endif(Q_WS_MAC)
endmacro (KDE4_ADD_APP_ICON) endmacro (TOMAHAWK_ADD_APP_ICON)

2
admin/mac/build-release-osx.sh
View File

@@ -35,8 +35,6 @@ VERSION=$1
cd Tomahawk.app cd Tomahawk.app
header "Renaming icon"
mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
header "Copying Sparkle framework" header "Copying Sparkle framework"

2
src/tomahawk/CMakeLists.txt
View File

@@ -146,7 +146,7 @@ IF( BUILD_GUI )
qt_wrap_ui( tomahawkUI_H ${tomahawkUI} ) qt_wrap_ui( tomahawkUI_H ${tomahawkUI} )
ENDIF() ENDIF()
kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" ) tomahawk_add_app_icon( tomahawkSources Tomahawk "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
qt_add_resources( RC_SRCS "../../resources.qrc" ) qt_add_resources( RC_SRCS "../../resources.qrc" )
SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} ) SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )