[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-05-18 21:13:35
Message-ID: 20130518211335.D3D4AAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1355328 by pali:

Update kopete cmake files

* Remove cmake module FindmsiLBC.cmake because is not used anymore
* Add cmake modules FindSRTP.cmake and FindJsonCpp.cmake needed for google libjingle
* Update dependences for building google libjingle


 M  +11 -5     CMakeLists.txt  
 A             cmake/modules/FindJsonCpp.cmake  
 A             cmake/modules/FindSRTP.cmake  
 D             cmake/modules/FindmsiLBC.cmake  
 M  +3 -4      protocols/CMakeLists.txt  


--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #1355327:1355328
@@ -56,19 +56,25 @@
 check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)
 
 macro_optional_find_package(LiboRTP)
-macro_log_feature(LIBORTP_FOUND "libortp" "oRTP provides an API to send rtp packets" \
"http://www.linphone.org/index.php/eng/code_review/ortp" FALSE "0.13" "Needed to \
build Jingle support, Google Talk libjingle audio call support and voice clips in \
WLM.") +macro_log_feature(LIBORTP_FOUND "libortp" "oRTP provides an API to send rtp \
packets" "http://www.linphone.org/index.php/eng/code_review/ortp" FALSE "0.13" \
"Needed to build voice clips in WLM.")  
-macro_optional_find_package(Speex)
-macro_log_feature(SPEEX_FOUND "speex" "speex is an encoder/decoder for the speex \
audio format." "http://www.speex.org/" FALSE "" "Needed to build Jingle support in \
Kopete.") +macro_optional_find_package(SRTP)
+macro_log_feature(SRTP_FOUND "srtp" "SRTP provides an implementation of the Secure \
Real-time Transport Protocol (SRTP)" "http://srtp.sourceforge.net/srtp.html" FALSE "" \
"Needed to build Google Talk libjingle audio call support")  
+macro_optional_find_package(JsonCpp)
+macro_log_feature(JSONCPP_FOUND "jsoncpp" "jsoncpp is an implementation of a JSON \
reader and writer in C++" "http://jsoncpp.sourceforge.net/" FALSE "" "Needed to build \
Google Talk libjingle audio call support") +
+#macro_optional_find_package(Speex)
+#macro_log_feature(SPEEX_FOUND "speex" "speex is an encoder/decoder for the speex \
audio format." "http://www.speex.org/" FALSE "" "Needed to build Jingle support in \
Kopete.") +
 macro_optional_find_package(QCA2)
 macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" \
"http://delta.affinix.com/qca" FALSE "2.0.0" "Needed to build Kopete's GroupWise and \
Jabber protocols.")  
 macro_optional_find_package(IDN)
 macro_log_feature(IDN_FOUND "IDN" "GNU Libidn Internationalized Domain Name (IDN) \
implemenation" "http://www.gnu.org/software/libidn/" FALSE "" "Used by the Kopete \
Jabber plugin.")  
-macro_optional_find_package(Alsa)
-macro_log_feature(ALSA_FOUND "Alsa" "Alsa is Advanced Linux Sound Architecture" "" \
FALSE "" "Needed for Jingle Support in Kopete Jabber Plugin") \
+#macro_optional_find_package(Alsa) +#macro_log_feature(ALSA_FOUND "Alsa" "Alsa is \
Advanced Linux Sound Architecture" "" FALSE "" "Needed for Jingle Support in Kopete \
Jabber Plugin")  
 macro_optional_find_package(Xmms)
 macro_bool_to_01(XMMS_FOUND HAVE_XMMS)
--- trunk/KDE/kdenetwork/kopete/protocols/CMakeLists.txt #1355327:1355328
@@ -29,15 +29,14 @@
 #endif(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE)
 set(BUILD_JINGLE FALSE)
 
-# TODO: remove LIBORTP_FOUND and MEDIASTREAMER_FOUND if google libjingle \
filetransfer will be supported  if(SSL_FOUND OR WIN32)
-  if(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK)
+  if(EXPAT_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND \
WITH_GOOGLETALK)  message(STATUS "Building Google Talk libjingle support")
     set(BUILD_GOOGLETALK TRUE)
-  else(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK)
+  else(EXPAT_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND \
WITH_GOOGLETALK)  message(STATUS "Not building Google Talk libjingle support")
     set(BUILD_GOOGLETALK FALSE)
-  endif(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK)
+  endif(EXPAT_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND \
WITH_GOOGLETALK)  else(SSL_FOUND OR WIN32)
   message(STATUS "Not building Google Talk libjingle support")
   set(BUILD_GOOGLETALK FALSE)


[prev in list] [next in list] [prev in thread] [next in thread]