GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-21 06:36:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict with master

Browse Source
This commit is contained in:
holmes1412
2021-06-21 14:00:38 +08:00
parent cb3bf78eba
commit dc7db6fc4b
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists_Headers.txt
+8 -10
View File
@@ -7,7 +7,6 @@ set(COMMON_KERNEL_HEADERS
src/kernel/SleepRequest.h
src/kernel/ExecRequest.h
src/kernel/IORequest.h
src/kernel/TransRequest.h
src/kernel/Executor.h
src/kernel/list.h
src/kernel/mpoller.h
@@ -37,7 +36,7 @@ else ()
endif ()
set(INCLUDE_HEADERS
src/algorithm/DNSRoutine.h
src/algorithm/DnsRoutine.h
src/algorithm/MapReduce.h
src/algorithm/MapReduce.inl
src/protocol/ProtocolMessage.h
@@ -55,15 +54,17 @@ set(INCLUDE_HEADERS
src/protocol/mysql_types.h
src/protocol/mysql_byteorder.h
src/protocol/SSLWrapper.h
src/protocol/WebSocketMessage.h
src/protocol/websocket_parser.h
src/protocol/dns_parser.h
src/protocol/DnsMessage.h
src/protocol/DnsUtil.h
src/server/WFServer.h
src/server/WFDnsServer.h
src/server/WFHttpServer.h
src/server/WFRedisServer.h
src/server/WFMySQLServer.h
src/client/WFMySQLConnection.h
src/client/WFWebSocketClient.h
src/manager/DNSCache.h
src/client/WFDnsClient.h
src/manager/DnsCache.h
src/manager/WFGlobal.h
src/manager/UpstreamManager.h
src/manager/RouteManager.h
@@ -71,7 +72,6 @@ set(INCLUDE_HEADERS
src/manager/WFFuture.h
src/manager/WFFacilities.h
src/manager/WFFacilities.inl
src/manager/WFCondition.h
src/util/EncodeStream.h
src/util/LRUCache.h
src/util/StringUtil.h
@@ -88,10 +88,8 @@ set(INCLUDE_HEADERS
src/factory/WFAlgoTaskFactory.inl
src/factory/Workflow.h
src/factory/WFOperator.h
src/factory/WFChannel.h
src/factory/WFChannel.inl
src/nameservice/WFNameService.h
src/nameservice/WFDNSResolver.h
src/nameservice/WFDnsResolver.h
src/nameservice/WFServiceGovernance.h
src/nameservice/UpstreamPolicies.h
)
src/protocol/CMakeLists.txt
+6 -2
View File
@@ -2,17 +2,18 @@ cmake_minimum_required(VERSION 3.6)
project(protocol)
set(SRC
dns_parser.c
http_parser.c
redis_parser.c
mysql_stream.c
mysql_parser.c
mysql_byteorder.c
websocket_parser.c
DnsMessage.cc
DnsUtil.cc
MySQLMessage.cc
MySQLResult.cc
HttpMessage.cc
RedisMessage.cc
WebSocketMessage.cc
HttpUtil.cc
SSLWrapper.cc
)
@@ -27,5 +28,8 @@ if (KAFKA STREQUAL "y")
KafkaResult.cc
)
add_library("protocol_kafka" OBJECT ${SRC})
set_property(SOURCE KafkaMessage.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
set_property(SOURCE KafkaDataTypes.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
set_property(SOURCE KafkaResult.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
endif ()