From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 797e683..93c317d 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -53,6 +53,11 @@
../../../BasicPlatForm/libs/mysql/include/mysql/
../../../BasicPlatForm/basic/util/app/
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/include
+ ../../../BasicPlatForm/libs/libevent/include
+
+
)
link_directories(
@@ -81,6 +86,10 @@
../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
../../../BasicPlatForm/libs/mysqlpp/lib
../../../BasicPlatForm/libs/mysql/lib
+
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/lib
+ ../../../BasicPlatForm/libs/libevent/lib
)
add_executable(DataWebServer
@@ -111,7 +120,7 @@
../LocalDBTool/SqliteFaceEncap.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
- )
+ vss/dao/BaseDao.cpp)
target_link_libraries(DataWebServer
glog
@@ -157,6 +166,11 @@
pthread
mysqlpp
mysqlclient
+
+ #mq
+ event
+ evnsq
+ evpp_concurrentqueue
)
#add_executable(Apptest
--
Gitblit v1.8.0