stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1 from Ri0n/swiften3

Browse source 
Swiften3 compilation fixes
This commit is contained in:
vitalyster 2015-10-03 12:36:46 +03:00
commit ddbeef1ecc
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backends/libyahoo2/main.cpp
View file

@ -107,7 +107,11 @@ class YahooPlugin : public NetworkPlugin {
this->config = config;
m_factories = new Swift::BoostNetworkFactories(loop);
m_sslFactory = new Swift::OpenSSLContextFactory();
#if HAVE_SWIFTEN3
m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory(), Swift::TLSOptions());
#else
m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory());
#endif
m_conn = m_factories->getConnectionFactory()->createConnection();
m_conn->onDataRead.connect(boost::bind(&YahooPlugin::_handleDataRead, this, _1));
m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(host), port));

2
backends/twitter/CMakeLists.txt
View file

@ -2,7 +2,7 @@ include_directories (${libtransport_SOURCE_DIR}/backends/twitter/libtwitcurl)
FILE(GLOB SRC *.cpp libtwitcurl/*.cpp Requests/*.cpp)
add_executable(spectrum2_twitter_backend ${SRC})
find_package(curl)
find_package(CURL)
if(CURL_FOUND)
message(STATUS "Using curl ${CURL_VERSION_STRING}: ${CURL_INCLUDE_DIRS} ${CURL_LIBRARIES}")