diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index e863cf678..f8b5c6a01 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -1,111 +1,111 @@ option(WITH_testbed "Enable Kopete testbed protocol" ON) option(WITH_oscar "Enable Kopete Oscar (ICQ and AIM) protocol" ON) option(WITH_yahoo "Enable Kopete Yahoo protocol" ON) option(WITH_qq "Enable Kopete QQ protocol" ON) option(WITH_sms "Enable Kopete SMS protocol" ON) option(WITH_groupwise "Enable Novell GroupWise Messenger protocol" ON) option(WITH_winpopup "Enable Kopete winpopup protocol" ON) option(WITH_gadu "Enable Kopete Gadu-Gadu protocol" ON) option(WITH_jabber "Enable Kopete Jabber protocol" ON) option(WITH_libjingle "Enable Kopete Jabber libjingle support" ON) option(WITH_bonjour "Enable Kopete Bonjour protocol" ON) option(WITH_wlm "Enable Window Live Messenger support" ON) option(WITH_WLM_MEDIASTREAMER "Enable Windows Live Messenger voice clip support" ON) option(WITH_meanwhile "Enable Kopete meanwhile protocol" ON) option(WITH_skype "Enable Kopete Skype protocol" ON) # Disable jingle support because it is not working and libiris does not support it #if(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) # message(STATUS "Building jingle support") # set(BUILD_JINGLE TRUE) #else() # message(STATUS "Not building jingle support (recommended)") # set(BUILD_JINGLE FALSE) #endif() set(BUILD_JINGLE FALSE) if(OPENSSL_FOUND OR WIN32) if(EXPAT_FOUND AND LIBORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND WITH_libjingle) message(STATUS "Building jabber libjingle support") set(BUILD_LIBJINGLE TRUE) else() message(STATUS "Not building jabber libjingle support") set(BUILD_LIBJINGLE FALSE) endif() else() message(STATUS "Not building jabber libjingle support") set(BUILD_LIBJINGLE FALSE) endif() if(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER) message(STATUS "Building Windows Live Messenger voice clip support") set(BUILD_WLM_MEDIASTREAMER TRUE) else() message(STATUS "Not building Windows Live Messenger voice clip support") set(BUILD_WLM_MEDIASTREAMER FALSE) endif() include_directories(${KOPETE_INCLUDES}) if(WITH_wlm AND LIBMSN_FOUND AND Boost_FOUND) add_subdirectory( wlm ) endif() if(WITH_oscar) add_subdirectory( oscar ) endif() if(WITH_yahoo AND JASPER_FOUND) add_subdirectory( yahoo ) endif() if(WITH_qq) add_subdirectory( qq ) endif() if(NOT WIN32) if(WITH_winpopup) add_subdirectory( winpopup ) endif() if(WITH_gadu AND LIBGADU_FOUND) add_subdirectory( gadu ) endif() message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: sms plugin disabled") # if(WITH_sms) # add_subdirectory( sms ) # endif() message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: skype plugin disabled") # if(NOT APPLE AND WITH_skype) # add_subdirectory( skype ) # endif() endif() if(Qca-qt5_FOUND AND ZLIB_FOUND) - if(IDN_FOUND AND QJSON_FOUND) + if(IDN_FOUND) if(WITH_jabber) add_subdirectory( jabber ) endif() else() - message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel or qjson was not found") + message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel was not found") endif() if(WITH_groupwise) add_subdirectory( groupwise ) endif() else() message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled GroupWise and Jabber because QCA2 was not found") endif() if(WITH_testbed) add_subdirectory( testbed ) endif() if(WITH_bonjour) add_subdirectory( bonjour ) endif() if(WITH_meanwhile) if(LIBMEANWHILE_FOUND) add_subdirectory( meanwhile ) else() message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Meanwhile beause libmeanwhile was not found") endif() endif() diff --git a/protocols/jabber/CMakeLists.txt b/protocols/jabber/CMakeLists.txt index 6ea47b82e..e2c54beb5 100644 --- a/protocols/jabber/CMakeLists.txt +++ b/protocols/jabber/CMakeLists.txt @@ -1,179 +1,178 @@ add_definitions(-DIRIS_XMPP_JID_DEPRECATED) add_subdirectory( icons ) add_subdirectory( libiris ) #FIXME:glib : necessary ? include_directories( ${KOPETE_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/ui/ ${CMAKE_CURRENT_SOURCE_DIR}/tasks/ ${CMAKE_CURRENT_SOURCE_DIR}/libiris/include/iris ${CMAKE_CURRENT_SOURCE_DIR}/libiris/src ${QCA2_INCLUDE_DIR} - ${QJSON_INCLUDE_DIR} ) if(BUILD_LIBJINGLE) add_subdirectory(libjingle) add_definitions(-DLIBJINGLE_SUPPORT) endif(BUILD_LIBJINGLE) IF(BUILD_JINGLE) add_definitions(-DJINGLE_SUPPORT) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jingle) include_directories(${LIBORTP_INCLUDE_DIR} ${ALSA_INCLUDES} ${SPEEX_INCLUDE_DIR}) ENDIF(BUILD_JINGLE) #link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ${CMAKE_CURRENT_BINARY_DIR}/jingle/ ) link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ) ########### next target ############### set(kopete_jabber_ui_SRCS ui/dlgxmppconsole.cpp ui/jabberaddcontactpage.cpp ui/dlgjabbervcard.cpp ui/dlgjabberservices.cpp ui/dlgregister.cpp ui/dlgsearch.cpp ui/dlgahcommand.cpp ui/dlgahclist.cpp ui/jabbereditaccountwidget.cpp ui/jabberregisteraccount.cpp ui/jabberchooseserver.cpp ui/dlgjabberbookmarkeditor.cpp ui/dlgjabberchangepassword.cpp ui/dlgjabberchatroomslist.cpp ui/dlgjabberchatjoin.cpp ui/privacylistblockedmodel.cpp ui/privacylistmodel.cpp ui/privacydlg.cpp ui/privacyruledlg.cpp ui/dlgjabberxoauth2.cpp ) ecm_qt_declare_logging_category(kopete_jabber_ui_SRCS HEADER jabber_protocol_debug.h IDENTIFIER JABBER_PROTOCOL_LOG CATEGORY_NAME org.kde.kopete.jabber) if(BUILD_LIBJINGLE) set(kopete_jabber_ui_SRCS ${kopete_jabber_ui_SRCS} libjinglecalldialog.cpp ) endif(BUILD_LIBJINGLE) if(BUILD_JINGLE) set(kopete_jabber_ui_SRCS ${kopete_jabber_ui_SRCS} jingle/jinglecontentdialog.cpp jingle/jinglecallsgui.cpp ) endif(BUILD_JINGLE) set(kopete_jabber_ui_files # ${kopete_jabber_ui_SRCS} ui/dlgxmppconsole.ui ui/dlgjabberregisteraccount.ui ui/dlgjabberchooseserver.ui ui/dlgvcard.ui ui/dlgservices.ui ui/dlgaddcontact.ui ui/dlgsearch.ui ui/dlgchangepassword.ui ui/dlgjabberbookmarkeditor.ui ui/dlgjabbereditaccountwidget.ui ui/dlgchatjoin.ui ui/dlgchatroomslist.ui ui/privacyrule.ui ui/privacy.ui ui/dlgxoauth2.ui ) if(BUILD_LIBJINGLE) set(kopete_jabber_ui_files ${kopete_jabber_ui_files} libjinglecalldialog.ui ) endif(BUILD_LIBJINGLE) if(BUILD_JINGLE) set(kopete_jabber_ui_files ${kopete_jabber_ui_files} jingle/jinglecontentdialog.ui jingle/jinglecallsgui.ui ) endif(BUILD_JINGLE) ki18n_wrap_ui(kopete_jabber_ui_SRCS ${kopete_jabber_ui_files}) set(kopete_jabber_PART_SRCS tasks/jt_getlastactivity.cpp tasks/jt_privatestorage.cpp tasks/jt_ahcommand.cpp tasks/jt_xsearch.cpp tasks/jt_xregister.cpp tasks/jt_pubsub.cpp tasks/mood.cpp tasks/privacylistitem.cpp tasks/privacylist.cpp tasks/privacymanager.cpp ${kopete_jabber_ui_SRCS} jabberprotocol.cpp jabberaccount.cpp jabberresource.cpp jabberresourcepool.cpp jabberbasecontact.cpp jabbercontact.cpp jabbergroupcontact.cpp jabbergroupmembercontact.cpp jabbercontactpool.cpp jabberformtranslator.cpp jabberxdatawidget.cpp jabberformlineedit.cpp jabberchatsession.cpp jabbergroupchatmanager.cpp jabberfiletransfer.cpp jabbercapabilitiesmanager.cpp jabbertransport.cpp jabberbookmarks.cpp jabberclient.cpp jabberbobcache.cpp xoauth2provider.cpp ) qt5_add_resources(kopete_jabber_PART_SRCS jabberprotocol.qrc) if(BUILD_LIBJINGLE) set(kopete_jabber_PART_SRCS ${kopete_jabber_PART_SRCS} libjingle.cpp ) endif(BUILD_LIBJINGLE) if(BUILD_JINGLE) set(kopete_jabber_PART_SRCS ${kopete_jabber_PART_SRCS} jingle/jinglecallsmanager.cpp jingle/jabberjinglesession.cpp jingle/jabberjinglecontent.cpp jingle/jinglertpsession.cpp jingle/mediamanager.cpp jingle/mediasession.cpp jingle/alsaio.cpp jingle/speexio.cpp jingle/abstractio.cpp ) endif(BUILD_JINGLE) add_library(kopete_jabber MODULE ${kopete_jabber_PART_SRCS}) generate_export_header(kopete_jabber BASE_NAME jabber) target_link_libraries(kopete_jabber KF5::KIOCore ${QCA2_LIBRARIES} kopete iris_kopete) if(BUILD_JINGLE) target_link_libraries(kopete_jabber ${LIBORTP_LIBRARY} ${ASOUND_LIBRARY} ${SPEEX_LIBRARY}) endif(BUILD_JINGLE) install(TARGETS kopete_jabber DESTINATION ${KDE_INSTALL_PLUGINDIR}) ########### install files ############### install( FILES kopete_jabber.desktop xmpp.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR})