Attachment 937 Details for Bug 1278 – Added XMMS supoort to CMake

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Added XMMS supoort to CMake

bp908.diff (text/plain), 2.77 KB, created by Slávek Banko on 2012-10-25 20:02:09 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2012-10-25 20:02:09 CDT

Size: 2.77 KB

patch

obsolete

>Index: b/CMakeLists.txt
>===================================================================
>--- a/CMakeLists.txt	2012-10-26 02:48:51.000000000 +0200
>+++ b/CMakeLists.txt	2012-10-26 02:48:57.000000000 +0200
>@@ -48,6 +48,7 @@
> option( WITH_SPEEX "Enable speex support (for jingle)" OFF )
> option( WITH_WEBCAM "Enable webcam support (kopete/msn)" OFF )
> option( WITH_GSM "Enable GSM SMS support (kopete/sms)" OFF )
>+option( WITH_XMMS "Enable XMMS support (kopete/nowlistening)" OFF )
> option( WITH_ARTS "Enable aRts support" OFF )
> option( WITH_SLP "Enable OpenSLP support (krdc, krfb)" OFF )
> 
>Index: b/config.h.cmake
>===================================================================
>--- a/config.h.cmake	2012-10-26 02:48:51.000000000 +0200
>+++ b/config.h.cmake	2012-10-26 02:48:57.000000000 +0200
>@@ -17,6 +17,9 @@
> #cmakedefine HAVE_GLIB 1
> #cmakedefine HAVE_SPEEX 1
> 
>+// kopete/plugins/nowlistening
>+#cmakedefine HAVE_XMMS 1
>+
> // kppp
> #cmakedefine HAVE_SYS_PARAM_H 1
> #cmakedefine HAVE_NET_IF_PPP_H 1
>Index: b/kopete/plugins/nowlistening/CMakeLists.txt
>===================================================================
>--- a/kopete/plugins/nowlistening/CMakeLists.txt	2012-10-26 02:48:51.000000000 +0200
>+++ b/kopete/plugins/nowlistening/CMakeLists.txt	2012-10-26 02:51:47.000000000 +0200
>@@ -9,6 +9,8 @@
> #
> #################################################
> 
>+include( ConfigureChecks.cmake )
>+
> include_directories(
>   ${CMAKE_CURRENT_BINARY_DIR}
>   ${CMAKE_BINARY_DIR}
>@@ -16,6 +18,7 @@
>   ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
>   ${TDE_INCLUDE_DIR}
>   ${TQT_INCLUDE_DIRS}
>+  ${XMMS_INCLUDES}
> )
> 
> link_directories(
>@@ -38,7 +41,7 @@
>     nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp
>     nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp
>     nlamarok.cpp nlkaffeine.cpp
>-  LINK kopete-shared
>+  LINK kopete-shared ${XMMS_LIBS}
>   DESTINATION ${PLUGIN_INSTALL_DIR}
> )
> 
>Index: b/kopete/plugins/nowlistening/ConfigureChecks.cmake
>===================================================================
>--- /dev/null	1970-01-01 00:00:00.000000000 +0000
>+++ b/kopete/plugins/nowlistening/ConfigureChecks.cmake	2012-10-26 02:48:57.000000000 +0200
>@@ -0,0 +1,22 @@
>+#################################################
>+#
>+#  (C) 2012 Slavek Banko
>+#  slavek (DOT) banko (AT) axis.cz
>+#
>+#  Improvements and feedback are welcome
>+#
>+#  This file is released under GPL >= 2
>+#
>+#################################################
>+
>+# xmms
>+if( WITH_XMMS )
>+  find_program( XMMS_CONFIG xmms-config )
>+  if( XMMS_CONFIG )
>+    set( HAVE_XMMS 1 )
>+    EXEC_PROCESS( COMMAND ${XMMS_CONFIG} --cflags OUTPUT_VARIABLE XMMS_INCLUDES )
>+    EXEC_PROCESS( COMMAND ${XMMS_CONFIG} --libs OUTPUT_VARIABLE XMMS_LIBS )
>+  else
>+    tde_message_fatal( "xmms is required, but was not found on your system" )
>+  endif( )
>+endif( )

Actions: View | Diff

Attachments on bug 1278: 936 | 937