libtransport.git Changeset - c1cbd2d1616a

Changeset - c1cbd2d1616a

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 14 years ago 2011-10-18 10:53:06
hanzz.k@gmail.com

Fixed compilation problems + support for latest swiften

3 files changed with 18 insertions and 10 deletions:

include/Swiften/Network/DummyNetworkFactories.h

include/transport/CMakeLists.txt

src/CMakeLists.txt

0 comments (0 inline, 0 general)

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -37,12 +37,20 @@ namespace Swift { @@
+			}
 			Swift::XMLParserFactory* getXMLParserFactory() const {
 				return 0;
+			}
             Swift::TLSContextFactory* getTLSContextFactory() const {
                 return 0;
+            }
             Swift::ProxyProvider* getProxyProvider() const {
                 return 0;
+            }
 		private:
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 	};

include/transport/CMakeLists.txt

➞

Show inline comments

 if (PROTOBUF_FOUND)
 	add_custom_target(pb
 		${PROTOBUF_PROTOC_EXECUTABLE}
 		--cpp_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
 		COMMENT "Running C++ protocol buffer compiler on protocol.proto"
 		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
 		VERBATIM )
     ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/protocol.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/protocol.pb.h
         COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
         COMMENT "Running C++ protocol buffer compiler on protocol.proto"
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
+    )
     ADD_CUSTOM_TARGET(pb DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/protocol.pb.cc)
 endif()
 FILE(GLOB HEADERS *.h protocol.h)
 INSTALL(FILES ${HEADERS} DESTINATION include/transport COMPONENT headers)
@@ \ No newline at end of file @@

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -14,18 +14,17 @@ endif() @@
 include_directories(${POPT_INCLUDE_DIR})
 # SOURCE_GROUP(headers FILES ${HEADERS})
 if (PROTOBUF_FOUND)
 	ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ../include/transport/protocol.pb.cc)
 	ADD_DEPENDENCIES(transport pb)
     ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ../include/transport/protocol.pb.cc)
     ADD_DEPENDENCIES(transport pb)
 else()
-	ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
+    ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
 endif()
 ADD_DEFINITIONS(-fPIC)
 TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})

0 comments (0 inline, 0 general)