Temporarily removed DNS support to prevent TLS h_errno conflict. Updated CMakeLists

This commit is contained in:
Joseph Henry
2017-12-07 16:45:02 -08:00
parent 78bf7c3a1f
commit de0ce73023
5 changed files with 13 additions and 7 deletions

View File

@@ -53,9 +53,10 @@ include_directories("${PROJ_DIR}/zto/node")
include_directories("${PROJ_DIR}/zto/service")
file(GLOB zto_src_glob "${ZTO_SRC_DIR}/node/*.cpp" "${ZTO_SRC_DIR}/service/*.cpp" "${ZTO_SRC_DIR}/osdep/OSUtils.cpp" "${ZTO_SRC_DIR}/controller/*.cpp" "${ZTO_SRC_DIR}/osdep/ManagedRoute.cpp")
add_library(zto ${zto_src_glob})
add_dependencies(zto zt)
add_library(httpparser "${ZTO_SRC_DIR}/ext/http-parser/http_parser.c")
target_compile_options(zto PRIVATE -std=c++11 -DZT_SDK=1)
target_link_libraries(zto httpparser)
target_link_libraries(zto httpparser zt)
# libzt
set(LIBZT_SRC_DIR ${PROJ_DIR}/src)
@@ -63,7 +64,6 @@ include_directories("${LIBZT_SRC_DIR}")
include_directories("${PROJ_DIR}/include")
file(GLOB libzt_src_glob ${LIBZT_SRC_DIR}/*.cpp)
add_library(zt ${libzt_src_glob})
add_dependencies(zt zto)
target_compile_options(zt PRIVATE -std=c++11 -DZT_SDK=1 -DLIBZT_TRACE=1)
target_link_libraries(zt zto)
target_link_libraries(zt lwip)