From c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:03:50 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index d6a2220..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
@@ -154,7 +155,8 @@
HCCore
hcnetsdk
pthread
-# mysqlpp
+ mysqlpp
+ mysqlclient
)
#add_executable(Apptest
--
Gitblit v1.8.0