diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdca7c14598d4e73ede574912c332f3904cdc977..9a10d6c95b71404d92e6accf73f893adc3fa467f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,10 +110,10 @@ endif()
 # FIND SQLITE3
 if (ENABLE_SQLITE3)
 	if (NOT CMAKE_COMPILER_IS_GNUCXX)
-		ADD_SUBDIRECTORY(msvc-deps)
+		ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3)
 	else()
 		if (WIN32)
-			ADD_SUBDIRECTORY(msvc-deps/sqlite3)
+			ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3)
 		else()
 			set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 			find_package(sqlite3)
@@ -279,7 +279,7 @@ if (SQLITE3_FOUND)
 else (SQLITE3_FOUND)
 	if (WIN32)
 		ADD_DEFINITIONS(-DWITH_SQLITE)
-		include_directories(msvc-deps/sqlite3)
+		include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
 		message("SQLite3           : bundled")
 	else()
 		set(SQLITE3_LIBRARIES "")
@@ -358,7 +358,11 @@ if (PROTOBUF_FOUND)
 			message("IRC plugin        : no (user disabled)")
 		endif()
 	endif()
-
+	if(ENABLE_TWITTER)
+		message("Twitter plugin    : yes")
+	else(ENABLE_TWITTER)
+		message("Twitter plugin    : no (user disabled)")
+	endif()
 	if (NOT WIN32)
 		if(ENABLE_FROTZ)
 			message("Frotz plugin      : yes")
@@ -380,16 +384,10 @@ if (PROTOBUF_FOUND)
 				message("Skype plugin      : no (user disabled)")
 			endif()
 		endif()
-		if(ENABLE_TWITTER)
-			message("Twitter plugin    : yes")
-		else(ENABLE_TWITTER)
-			message("Twitter plugin    : no (user disabled)")
-		endif()
 	else()
 		message("Frotz plugin      : no (does not run on Win32)")
 		message("SMSTools3 plugin  : no (does not run on Win32)")
 		message("Skype plugin      : no (does not run on Win32)")
-		message("Twitter plugin    : no (does not run on Win32)")
 	endif()
 
  	if(YAHOO2_FOUND)