From e05372302d307e186c017e8f1f2f1f63dc670f7a Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Wed, 8 Apr 2020 11:35:45 +0200
Subject: Should bring back xmms support in kopete's plugins.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
---
 kopete/plugins/nowlistening/ConfigureChecks.cmake | 58 +++++++++++++++--------
 1 file changed, 39 insertions(+), 19 deletions(-)

(limited to 'kopete/plugins/nowlistening/ConfigureChecks.cmake')

diff --git a/kopete/plugins/nowlistening/ConfigureChecks.cmake b/kopete/plugins/nowlistening/ConfigureChecks.cmake
index c1780d68..b1f98548 100644
--- a/kopete/plugins/nowlistening/ConfigureChecks.cmake
+++ b/kopete/plugins/nowlistening/ConfigureChecks.cmake
@@ -1,22 +1,42 @@
-#################################################
-#
-#  (C) 2012 Slavek Banko
-#  slavek (DOT) banko (AT) axis.cz
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
+###########################################
+#                                         #
+#  (C) 2012 Slavek Banko                  #
+#  slavek (DOT) banko (AT) axis.cz        #
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 2   #
+#                                         #
+###########################################
+
+##### xmms
 
-# xmms
 if( WITH_XMMS )
-  find_program( XMMS_CONFIG xmms-config )
-  if( XMMS_CONFIG )
+find_program( XMMS_CONFIG xmms-config )
+
+if( NOT XMMS_CONFIG )
+    tde_message_fatal( "xmms support has been requested but was not found on your system" )
+ else()
+    execute_process(
+        COMMAND ${XMMS_CONFIG} --cflags
+        OUTPUT_VARIABLE XMMS_INCLUDES
+        ERROR_VARIABLE  XMMS_INCLUDES
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_STRIP_TRAILING_WHITESPACE
+    )
+    string( REGEX MATCHALL "-I([^ ]*)" XMMS_INCLUDES "${XMMS_INCLUDES}" )
+    string( REGEX REPLACE "-I" "" XMMS_INCLUDES "${XMMS_INCLUDES}" )
+    set( XMMS_INCLUDE_DIRS "${XMMS_INCLUDES}" CACHE INTERNAL "" )
+
+    execute_process(
+        COMMAND ${XMMS_CONFIG} --libs
+        OUTPUT_VARIABLE XMMS_LIBS
+        ERROR_VARIABLE  XMMS_LIBS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_STRIP_TRAILING_WHITESPACE
+    )
+    set( XMMS_LIBRARIES "${XMMS_LIBS}" CACHE INTERNAL "" )
+
     set( HAVE_XMMS 1 CACHE INTERNAL "" )
-    EXECUTE_PROCESS( COMMAND ${XMMS_CONFIG} '--cflags' OUTPUT_VARIABLE XMMS_INCLUDES )
-    EXECUTE_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( )
+endif()
+endif( WITH_XMMS )
-- 
cgit v1.2.1