From bb4ad2684c18cec173444cc363c5dc1541d71764 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 21 Oct 2014 21:22:50 +0200
Subject: [PATCH] Add outfilename parameter to KDE4_ADD_APP_ICON and rename it
 to TOMAHAWK_ADD_APP_ICON because it's not compatible anymore

---
 CMakeModules/AddAppIconMacro.cmake | 6 +++---
 admin/mac/build-release-osx.sh     | 2 --
 src/tomahawk/CMakeLists.txt        | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeModules/AddAppIconMacro.cmake b/CMakeModules/AddAppIconMacro.cmake
index 918f7bd43..384a3372b 100644
--- a/CMakeModules/AddAppIconMacro.cmake
+++ b/CMakeModules/AddAppIconMacro.cmake
@@ -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)
@@ -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)
diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh
index 5413399dc..8d7973613 100755
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -35,8 +35,6 @@ VERSION=$1
 
     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
 
     header "Copying Sparkle framework"
diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
index 28c233d5f..9530f9542 100644
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@@ -146,7 +146,7 @@ IF( BUILD_GUI )
     qt_wrap_ui( tomahawkUI_H ${tomahawkUI} )
 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" )
 
 SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )