From 2b1a3988c9fd35c39e3e43d0382d65a13c45efee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期四, 14 三月 2019 10:38:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/DataManagerServer/CMakeLists.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index e36f449..ff08d21 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -80,6 +80,7 @@
     ../../../BasicPlatForm/basic/db/sqlite/
     ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
     ../../../BasicPlatForm/libs/mysqlpp/lib
+    ../../../BasicPlatForm/libs/mysql/lib
 )
 
 add_executable(DataWebServer
@@ -110,7 +111,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
@@ -155,6 +156,7 @@
     hcnetsdk
     pthread
     mysqlpp
+        mysqlclient
     )
 
 #add_executable(Apptest

--
Gitblit v1.8.0