Skip to content
Snippets Groups Projects
Commit cf40caae authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'master' into 'bugs-2706' 

# Conflicts:
#   CMakeLists.txt
parents 9f7ed19b 1f700167
No related branches found
No related tags found
1 merge request!3wepoll issues
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
CMakeLists.txt
+ 2
− 3
View file @ cf40caae
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project (dap_stream_ch_chain_net_srv) project (dap_stream_ch_chain_net_srv)
set(DAP_STREAM_CH_CHAIN_NET_SRV_SRCS dap_stream_ch_chain_net_srv.c dap_stream_ch_chain_net_srv_session.c dap_stream_ch_chain_net_srv_pkt.c) set(DAP_STREAM_CH_CHAIN_NET_SRV_SRCS dap_stream_ch_chain_net_srv.c dap_stream_ch_chain_net_srv_session.c dap_stream_ch_chain_net_srv_pkt.c)
if(WIN32) if(WIN32)
include_directories(../libdap/src/win32/) include_directories(../libdap/src/win32/)
include_directories(../3rdparty/libmemcached/) include_directories(../3rdparty/wepoll/include/)
include_directories(../3rdparty/libmemcached/win32/)
include_directories(../3rdparty/uthash/src/) include_directories(../3rdparty/uthash/src/)
include_directories(../3rdparty/libjson-c/) include_directories(../3rdparty/libjson-c/)
include_directories(../3rdparty/curl/include/) include_directories(../3rdparty/curl/include/)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment