diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 70f361c00..3eddeb895 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -158,7 +158,6 @@ set(LIBS
 	${ORTP_LIBRARIES}
 	${XML2_LIBRARIES}
 	${BELR_LIBRARIES}
-	${SOCI_LIBRARIES}
 )
 if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	list(APPEND LIBS "Ws2_32")
@@ -169,6 +168,9 @@ endif()
 if(ZLIB_FOUND)
 	list(APPEND LIBS ${ZLIB_LIBRARIES})
 endif()
+if(SOCI_FOUND)
+	list(APPEND LIBS ${SOCI_LIBRARIES})
+endif()
 if(SQLITE3_FOUND)
 	list(APPEND LIBS ${SQLITE3_LIBRARIES})
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c3ec397f..6615525fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,7 +53,11 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 )
 
 set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLIBLINPHONE_EXPORTS")
-set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS} ${SOCI_INCLUDE_DIRS} ${SOCI_MYSQL_INCLUDES})
+set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS})
+
+if(SOCI_FOUND)
+	list(APPEND LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${SOCI_INCLUDE_DIRS} ${SOCI_MYSQL_INCLUDES})
+endif()
 
 set(LINPHONE_PRIVATE_HEADER_FILES)
 foreach(header ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES})