libtransport.git Changeset - ddbeef1ecccb

Changeset - ddbeef1ecccb

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 0

vitalyster - 10 years ago 2015-10-03 11:36:46
vitalyster@gmail.com

Merge pull request #1 from Ri0n/swiften3

Swiften3 compilation fixes

2 files changed with 5 insertions and 1 deletions:

backends/libyahoo2/main.cpp

backends/twitter/CMakeLists.txt

0 comments (0 inline, 0 general)

backends/libyahoo2/main.cpp

➞

Show inline comments

@@ @@ -104,13 +104,17 @@ class YahooPlugin : public NetworkPlugin { @@
 		boost::shared_ptr<Swift::Connection> m_conn;
 		YahooPlugin(Config *config, Swift::SimpleEventLoop *loop, const std::string &host, int port) : 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));
 			LOG4CXX_INFO(logger, "Starting the plugin.");
+		}

backends/twitter/CMakeLists.txt

➞

Show inline comments

 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}")
 include_directories (${CURL_INCLUDE_DIRS})
 target_link_libraries(spectrum2_twitter_backend transport ${CURL_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 else()

0 comments (0 inline, 0 general)