Merge pull request #358 from tomahawk-player/osx-fixes

[OSX] Various build adjustments

src/libtomahawk/CMakeLists.txt

@@ -523,7 +523,6 @@ ENDIF( UNIX AND NOT APPLE )
 TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY}
     LINK_PRIVATE
     ${LIBVLC_LIBRARY}
-    ${LIBVLCCORE_LIBRARY}
 
     # Thirdparty shipped with tomahawk
     ${LIBPORTFWD_LIBRARIES}

src/tomahawk/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(TOMAHAWK_APPLICATION_TARGET "tomahahawk-bin")
+set(TOMAHAWK_APPLICATION_TARGET "tomahawk-bin")
 
 include( ECMAddAppIcon )
 
@@ -146,8 +146,14 @@ IF( BUILD_GUI )
 ENDIF()
 
 file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" )
+if(APPLE)
+    # OUTFILE is currently only supported in my branch, see https://git.reviewboard.kde.org/r/126303/
+    # once merged (and released), we can remove this conditional usage
+    ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS} OUTFILE "${TOMAHAWK_APPLICATION_NAME}")
+else()
+    ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS})
+endif()
 
-ecm_add_app_icon( tomahawkSources ICONS ${TOMAHAWK_ICONS} )
 
 qt_add_resources( RC_SRCS "../../resources.qrc" )