From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3
---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index d774952..46bbeb2 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,8 @@
../../../BasicPlatForm/basic/db/sqlite/
../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/libs/mysqlpp/lib
+ ../../../BasicPlatForm/libs/mysql/lib
)
add_executable(DataWebServer
@@ -96,6 +101,8 @@
../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
+
../../syncDBTool/ErlangDbTool.cpp
@@ -104,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
@@ -148,6 +155,8 @@
HCCore
hcnetsdk
pthread
+ mysqlpp
+ mysqlclient
)
#add_executable(Apptest
--
Gitblit v1.8.0