Merge branch 'master' into 'bugs-2706'

# Conflicts:
#   CMakeLists.txt

CMakeLists.txt

@@ -40,8 +40,7 @@ file(GLOB DAP_CLIENT_HEADERS include/*.h)
 
 if(WIN32)
   include_directories(../libdap/src/win32/)
-  include_directories(../3rdparty/libmemcached/)
-  include_directories(../3rdparty/libmemcached/win32/)
+  include_directories(../3rdparty/wepoll/include/)
   include_directories(../3rdparty/uthash/src/)
   include_directories(../3rdparty/libjson-c/)
   include_directories(../3rdparty/curl/include/)
@@ -54,7 +53,11 @@ if(WIN32)
 endif()
 
 if(UNIX)
-  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_udp_server dap_http_server dap_enc_server dap_stream dap_session dap_stream_ch pthread memcached ev)
+  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_udp_server dap_http_server dap_enc_server dap_stream dap_session dap_stream_ch json-c)
+
+  if(NOT ANDROID)
+      target_link_libraries(${PROJECT_NAME} ev)
+  endif()
 endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC include)