From a69dc917011fc3ad33478249d20ec0f496ea2127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 9 Feb 2020 19:16:54 +0100 Subject: [PATCH] Add missing option and detection for libxslt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit a0c4be8ea852195a7b5337003b0c6e4354126b64) --- CMakeLists.txt | 2 ++ config.h.cmake | 3 +++ kopete/ConfigureChecks.cmake | 16 ++++++++++++++++ kopete/plugins/webpresence/CMakeLists.txt | 4 +++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d702061b..4e0941e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,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_LIBXSLT "Enable XSLT support (kopete/webpresence)" OFF ) option( WITH_ARTS "Enable aRts support" OFF ) option( WITH_SLP "Enable OpenSLP support (krdc, krfb)" OFF ) @@ -64,6 +65,7 @@ option( WITH_SLP "Enable OpenSLP support (krdc, krfb)" OFF ) # WITH_GSM adds another backend to sms protocol in addition # to smsclient and smssend, the gsmlib # WITH_XMMS affects kopete[plugin_nowlistening] +# WITH_LIBXSLT affects kopete[plugin_webpresence] # WITH_ARTS affects wifi # WITH_SLP affects krdc krfb diff --git a/config.h.cmake b/config.h.cmake index df1f6404..cdda60ff 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -33,6 +33,9 @@ // kopete/plugins/nowlistening #cmakedefine HAVE_XMMS 1 +// kopete/plugins/webpresence +#cmakedefine HAVE_XSLT 1 + // kppp #cmakedefine HAVE_SYS_PARAM_H 1 #cmakedefine HAVE_NET_IF_PPP_H 1 diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake index 4001bb5a..6603eed5 100644 --- a/kopete/ConfigureChecks.cmake +++ b/kopete/ConfigureChecks.cmake @@ -29,6 +29,22 @@ if( BUILD_KOPETE_PROTOCOL_GROUPWISE OR BUILD_KOPETE_PROTOCOL_JABBER ) endif( ) +# libxslt (plugins/webpresence) + +if( BUILD_KOPETE_PLUGIN_WEBPRESENCE AND WITH_LIBXSLT ) + pkg_search_module( LIBXML libxml-2.0 ) + if( NOT LIBXML_FOUND ) + tde_message_fatal( "libxml is required, but not found on your system" ) + endif( ) + pkg_search_module( LIBXSLT libxslt ) + if( NOT LIBXSLT_FOUND ) + tde_message_fatal( "libxslt is required, but not found on your system" ) + else( ) + set( HAVE_XSLT 1 CACHE INTERNAL "" ) + endif( ) +endif( ) + + ### Check for videodev header check_include_file( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H ) if( HAVE_LIBV4L1_VIDEODEV_H ) diff --git a/kopete/plugins/webpresence/CMakeLists.txt b/kopete/plugins/webpresence/CMakeLists.txt index a2b07be0..afbd2f3b 100644 --- a/kopete/plugins/webpresence/CMakeLists.txt +++ b/kopete/plugins/webpresence/CMakeLists.txt @@ -16,6 +16,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${LIBXML_INCLUDE_DIRS} + ${LIBXSLT_INCLUDE_DIRS} ) link_directories( @@ -44,7 +46,7 @@ install( FILES tde_add_kpart( kopete_webpresence AUTOMOC SOURCES webpresenceplugin.cpp - LINK kopete-shared + LINK kopete-shared ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} )