- integrated cmake file changes from v1.3 branch

CMakeLists.txt

@@ -115,7 +115,7 @@ if(MSVC AND MSVC_VERSION LESS 1800)
     include_directories(
         ${CMAKE_CURRENT_LIST_DIR}/src/vs
     )
-endif()
+endif(MSVC AND MSVC_VERSION LESS 1800)
 
 if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/third_party/mbedtls/mbedtls-2.6.0)
 set(WITH_MBEDTLS 1)
@@ -139,6 +139,10 @@ include_directories(
 
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/hal")
 
+if(DEBUG)
+	set(CMAKE_BUILD_TYPE Debug)
+endif(DEBUG)
+
 if(BUILD_EXAMPLES)
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/examples)
 endif(BUILD_EXAMPLES)

src/logging/drivers/sqlite/log_storage_sqlite.c

@@ -25,7 +25,7 @@
 #include "logging_api.h"
 #include "libiec61850_platform_includes.h"
 
-#include <sqlite3.h>
+#include "sqlite3.h"
 
 #ifndef DEBUG_LOG_STORAGE_DRIVER
 #define DEBUG_LOG_STORAGE_DRIVER 0