Merge branch 'stable'

Conflicts:
	CMakeLists.txt

CMakeLists.txt

@@ -49,11 +49,20 @@ macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://develo
 # we need pthreads too
 find_package(Threads)
 
+find_package(KDE4)
+IF(KDE4_FOUND)
+    #KDE4 adds and removes some compiler flags that we don't like
+    STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+ELSE()
+    SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+ENDIF()
+
 include( CheckTagLibFileName )
 check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
 
 # optional
-IF( ENABLE_JREEN ) 
+IF( ENABLE_JREEN )
   macro_optional_find_package(Jreen)
   IF( LIBJREEN_FOUND )
     macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP library" "http://gitorious.org/jreen" FALSE "" "Jreen is needed for the alternative/new Jabber SIP plugin. Built automatically inside Tomahawk, if not installed systemwide and ENABLE_JREEN is true")
@@ -95,9 +104,10 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
+# KDE4 defines an uninstall target for us automatically
+IF( NOT KDE4_FOUND )
+    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ENDIF()
 
 IF( NOT APPLE )
     # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often

admin/unix/tomahawk.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=/home/leo/kde/tomahawk/build/tomahawk "%u"
+exec=/path/to/binary "%u"
 protocol=tomahawk
 input=none
 output=none

src/CMakeLists.txt

@@ -124,7 +124,7 @@ SET( tomahawkUI ${tomahawkUI}
 )
 
 INCLUDE_DIRECTORIES(
-    . 
+    .
     ${TOMAHAWK_INC_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
@@ -245,4 +245,14 @@ ENDIF( APPLE )
 
 INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION bin )
 
+IF(KDE4_FOUND) #install protocol file
+  FILE(READ ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.protocol protocol)
+  STRING( REPLACE "/path/to/binary" # match this
+              "${CMAKE_INSTALL_PREFIX}/bin/tomahawk" # this is linux (kde) so pretty safe I think
+              edited_protocol # save in this variable
+              "${protocol}" # from the contents of this var
+          )
+  FILE( WRITE ${CMAKE_BINARY_DIR}/tomahawk.protocol "${edited_protocol}" )
+  INSTALL( FILES ${CMAKE_BINARY_DIR}/tomahawk.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+ENDIF()
 #INCLUDE( "CPack.txt" )

thirdparty/alsa-playback/CMakeLists.txt

@@ -12,6 +12,8 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
+SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} )
+
 #ADD_DEFINITIONS(-Wall -O2 -DNDEBUG)
 ADD_DEFINITIONS(-fPIC)
 

thirdparty/jdns/CMakeLists.txt

@@ -9,6 +9,8 @@ INCLUDE( ${QT_USE_FILE} )
 add_definitions( ${QT_DEFINITIONS} )
 add_definitions( -DQT_SHARED )
 
+SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} )
+
 if(WIN32)
     set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" )
 endif(WIN32)

thirdparty/libportfwd/CMakeLists.txt

@@ -17,6 +17,8 @@ ELSE()
 ENDIF()
 INCLUDE_DIRECTORIES(${MINIUPNP_DIR} include)
 
+SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} )
+
 ADD_LIBRARY(portfwd STATIC
 
         # the needed bits of miniupnpc (no python module, no tests, no cli)