From 57283d68d1ee3f03dc931c472dcba5e7aec8d74e 2012-04-13 15:05:52
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: 2012-04-13 15:05:52
Subject: [PATCH] fix compilation

---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96be435b773860457080c0aa1a65cc626abc17e0..92cf7698f79f625555b001416114cafe92d26d5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ find_package(event)
 set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Swiften REQUIRED)
 
-if (NOT WIN32)
+if (CMAKE_COMPILER_IS_GNUCXX)
 set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(openssl REQUIRED)
 endif()
@@ -238,7 +238,7 @@ include_directories(${EVENT_INCLUDE_DIRS})
 include_directories(${SWIFTEN_INCLUDE_DIR})
 include_directories(${Boost_INCLUDE_DIRS})
 
-if (NOT WIN32)
+if (CMAKE_COMPILER_IS_GNUCXX)
 include_directories(${OPENSSL_INCLUDE_DIR})
 endif()
 
diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake
index f693e1edd35a7507a43ffa02be522533fde6d4c1..ea3de459096e64744f3cf6a7f2737572beaa6839 100644
--- a/cmake_modules/SwiftenConfig.cmake
+++ b/cmake_modules/SwiftenConfig.cmake
@@ -1,5 +1,5 @@
 FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften)
-FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften.h" PATH_SUFFIXES libSwiften Swiften )
+FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften/Swiften.h" PATH_SUFFIXES libSwiften Swiften )
 
 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
@@ -27,7 +27,7 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 		message( FATAL_ERROR "Could NOT find swiften-config" )
 	endif()
 
-	set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR}/.. )
+	set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR} )
 	message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")
 	set( SWIFTEN_FOUND 1 )
 else( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
diff --git a/plugin/cpp/CMakeLists.txt b/plugin/cpp/CMakeLists.txt
index b8ef46c1a9e9cc4fecb86da3da660e72721b42e4..392008da2a09b7f7e372b47c94b89900e725842e 100644
--- a/plugin/cpp/CMakeLists.txt
+++ b/plugin/cpp/CMakeLists.txt
@@ -18,7 +18,9 @@ ADD_DEPENDENCIES(transport-plugin pb)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
+	if (NOT WIN32)
 	ADD_DEFINITIONS(-fPIC)
+	endif()
 endif()
 
 if (NOT WIN32)
diff --git a/plugin/python/CMakeLists.txt b/plugin/python/CMakeLists.txt
index c851b4fd30bbe270893be20fd109e2a319895bd0..26ed8937f217ac9518e11328b74e3468de1b6109 100644
--- a/plugin/python/CMakeLists.txt
+++ b/plugin/python/CMakeLists.txt
@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
 if (PROTOBUF_FOUND)
+    if (WIN32)
+	set (PROTOBUF_PROTOC_EXECUTABLE protoc)
+    endif()
     ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/protocol_pb2.py
-        COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --python_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/ ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.proto
+        COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --python_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/ ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.proto
         COMMENT "Running Python protocol buffer compiler on protocol.proto"
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.proto
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.proto
     )
     ADD_CUSTOM_TARGET(pb-python ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/protocol_pb2.py)
 endif()
diff --git a/src/config.cpp b/src/config.cpp
index fdead32047957288cc89a699c3db5c807b872218..cadf06589cf787a78904285291a6b403bc34a449 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -24,8 +24,10 @@
 #include <direct.h>
 #define getcwd _getcwd
 #include <windows.h>
+#ifdef _MSC_VER
 #define PATH_MAX MAX_PATH
 #endif
+#endif
 
 using namespace boost::program_options;
 
diff --git a/src/transport.cpp b/src/transport.cpp
index eba43360f30f159515f006493a3300b62eaf9d17..8c2633c5ac0539268e43fe6e8202cf40f42a0148 100644
--- a/src/transport.cpp
+++ b/src/transport.cpp
@@ -29,7 +29,7 @@
 #include "discoinforesponder.h"
 #include "discoitemsresponder.h"
 #include "storageparser.h"
-#ifdef _WIN32
+#ifdef _MSC_VER
 #include <Swiften/TLS/CAPICertificate.h>
 #include "Swiften/TLS/Schannel/SchannelServerContext.h"
 #include "Swiften/TLS/Schannel/SchannelServerContextFactory.h"
@@ -85,7 +85,7 @@ Component::Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories,
 		if (!CONFIG_STRING(m_config, "service.cert").empty()) {
 			LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));
 			LOG4CXX_INFO(logger, "SSLv23_server_method used.");
-#ifdef _WIN32
+#ifdef _MSC_VER
 			TLSServerContextFactory *f = new SchannelServerContextFactory();
 			m_server->addTLSEncryption(f, boost::make_shared<CAPICertificate>(CONFIG_STRING(m_config, "service.cert")));
 #else