Should bring back xmms support in kopete's plugins.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/25/head
gregory guy 5 years ago
parent 3af27a421c
commit e05372302d
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4

@ -1,13 +1,13 @@
################################################# ###########################################
# # #
# (C) 2010-2011 Serghei Amelian # (C) 2010-2011 Serghei Amelian #
# serghei (DOT) amelian (AT) gmail.com # serghei (DOT) amelian (AT) gmail.com #
# # #
# Improvements and feedback are welcome # Improvements and feedback are welcome #
# # #
# This file is released under GPL >= 2 # This file is released under GPL >= 2 #
# # #
################################################# ###########################################
include( ConfigureChecks.cmake ) include( ConfigureChecks.cmake )
@ -18,7 +18,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/kopete/libkopete/ui ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${XMMS_INCLUDES} ${XMMS_INCLUDE_DIRS}
) )
link_directories( link_directories(
@ -26,32 +26,61 @@ link_directories(
) )
##### other data ################################ ##### kopete_nowlistening (module)
install( FILES kopete_nowlistening.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( kopete_nowlistening MODULE AUTOMOC
install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
install( FILES nowlisteningconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES nowlisteningui.rc nowlisteningchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete )
##### kopete_nowlistening (module) ##############
tde_add_kpart( kopete_nowlistening AUTOMOC
SOURCES SOURCES
nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nowlisteningconfig.kcfgc
nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nowlisteningplugin.cpp
nlamarok.cpp nlkaffeine.cpp nlkscd.cpp
LINK kopete-shared ${XMMS_LIBS} nlnoatun.cpp
nlxmms.cpp
nowlisteningguiclient.cpp
nljuk.cpp
nlamarok.cpp
nlkaffeine.cpp
LINK
kopete-shared
${XMMS_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
##### kcm_kopete_nowlistening (module) ########## ##### kcm_kopete_nowlistening (module)
tde_add_kpart( kcm_kopete_nowlistening MODULE AUTOMOC
tde_add_kpart( kcm_kopete_nowlistening AUTOMOC
SOURCES SOURCES
nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningprefs.ui
nowlisteningconfig.kcfgc nowlisteningpreferences.cpp
LINK tdeutils-shared nowlisteningconfig.kcfgc
LINK
tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
##### other data
install(
FILES kopete_nowlistening.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES kopete_nowlistening_config.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog
)
install(
FILES nowlisteningconfig.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)
install(
FILES nowlisteningui.rc nowlisteningchatui.rc
DESTINATION ${DATA_INSTALL_DIR}/kopete
)

@ -1,22 +1,42 @@
################################################# ###########################################
# # #
# (C) 2012 Slavek Banko # (C) 2012 Slavek Banko #
# slavek (DOT) banko (AT) axis.cz # slavek (DOT) banko (AT) axis.cz #
# # #
# Improvements and feedback are welcome # Improvements and feedback are welcome #
# # #
# This file is released under GPL >= 2 # This file is released under GPL >= 2 #
# # #
################################################# ###########################################
##### xmms
# xmms
if( WITH_XMMS ) if( WITH_XMMS )
find_program( XMMS_CONFIG xmms-config ) find_program( XMMS_CONFIG xmms-config )
if( 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 "" ) set( HAVE_XMMS 1 CACHE INTERNAL "" )
EXECUTE_PROCESS( COMMAND ${XMMS_CONFIG} '--cflags' OUTPUT_VARIABLE XMMS_INCLUDES ) endif()
EXECUTE_PROCESS( COMMAND ${XMMS_CONFIG} '--libs' OUTPUT_VARIABLE XMMS_LIBS ) endif( WITH_XMMS )
else( )
tde_message_fatal( "xmms is required, but was not found on your system" )
endif( )
endif( )

Loading…
Cancel
Save