From 15bdfab39ccf6b2129a2f2a04244c293f0584c58 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Fri, 13 Apr 2012 17:43:35 +0400
Subject: [PATCH] fix compilation 2

---
 CMakeLists.txt             | 5 ++++-
 backends/template/main.cpp | 6 +++---
 src/CMakeLists.txt         | 8 ++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92cf7698..11d7ee16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,13 @@ find_package(cppunit)
 if (NOT CMAKE_COMPILER_IS_GNUCXX)
 ADD_SUBDIRECTORY(msvc-deps)
 else()
+if (WIN32)
+ADD_SUBDIRECTORY(msvc-deps/sqlite3)
+else()
 set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(sqlite3)
 endif()
+endif()
 
 set(mysql_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(mysql)
@@ -120,7 +124,6 @@ else (SQLITE3_FOUND)
 if (WIN32)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
 	include_directories(msvc-deps/sqlite3)
-	set (SQLITE3_LIBRARIES "${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3/sqlite3.lib")
 	message("SQLite3           : bundled")
 else()
 	set(SQLITE3_LIBRARIES "")
diff --git a/backends/template/main.cpp b/backends/template/main.cpp
index 5975725c..047c54ab 100644
--- a/backends/template/main.cpp
+++ b/backends/template/main.cpp
@@ -6,7 +6,7 @@
 // Swiften
 #include "Swiften/Swiften.h"
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 // for signal handler
 #include "unistd.h"
 #include "signal.h"
@@ -79,7 +79,7 @@ class TemplatePlugin : public NetworkPlugin {
 		Config *config;
 };
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 
 static void spectrum_sigchld_handler(int sig)
 {
@@ -102,7 +102,7 @@ int main (int argc, char* argv[]) {
 	std::string host;
 	int port;
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 	if (signal(SIGCHLD, spectrum_sigchld_handler) == SIG_ERR) {
 		std::cout << "SIGCHLD handler can't be set\n";
 		return -1;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e55fce4..f739c45f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,8 +47,12 @@ endif()
 if (NOT CMAKE_COMPILER_IS_GNUCXX)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/protobuf/libprotobuf")
 	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 libprotobuf ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
-else (WIN32)
-	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
+else ()
+	if (WIN32)
+		TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARIES})
+	else()
+		TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
+	endif()
 endif()
 
 SET_TARGET_PROPERTIES(transport PROPERTIES