From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24: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 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 9e4b341..641363f 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -49,6 +49,9 @@
 
     #glog
     ../../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/mysqlpp/include
+    ../../../BasicPlatForm/libs/mysql/include/mysql/
+    ../../../BasicPlatForm/basic/util/app/
 
 )
 
@@ -76,6 +79,7 @@
 
     ../../../BasicPlatForm/basic/db/sqlite/
     ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+    ../../../BasicPlatForm/libs/mysqlpp/lib
 )
 
 add_executable(DataWebServer
@@ -106,7 +110,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
@@ -150,6 +154,7 @@
     HCCore
     hcnetsdk
     pthread
+    mysqlpp
     )
 
 #add_executable(Apptest

--
Gitblit v1.8.0