From c1cbd2d1616a8522004086afd82fb568f5481956 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Tue, 18 Oct 2011 10:53:06 +0200
Subject: [PATCH] Fixed compilation problems + support for latest swiften

---
 include/Swiften/Network/DummyNetworkFactories.h |  8 ++++++++
 include/transport/CMakeLists.txt                | 13 +++++++------
 src/CMakeLists.txt                              |  7 +++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h
index 0ba99113..8942be4b 100644
--- a/include/Swiften/Network/DummyNetworkFactories.h
+++ b/include/Swiften/Network/DummyNetworkFactories.h
@@ -40,6 +40,14 @@ namespace Swift {
 				return 0;
 			}
 
+            Swift::TLSContextFactory* getTLSContextFactory() const {
+                return 0;
+            }
+
+            Swift::ProxyProvider* getProxyProvider() const {
+                return 0;
+            }
+
 		private:
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
diff --git a/include/transport/CMakeLists.txt b/include/transport/CMakeLists.txt
index 17737c9f..2868190d 100644
--- a/include/transport/CMakeLists.txt
+++ b/include/transport/CMakeLists.txt
@@ -1,10 +1,11 @@
 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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4040e2f9..291844f3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,12 +17,11 @@ include_directories(${POPT_INCLUDE_DIR})
 
 
 
-
 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)