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 | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 3502803..641363f 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -36,7 +36,7 @@
../../../BasicPlatForm/libs/libuuid/include
../../../BasicPlatForm/libs/uniview/include
- ../../../Erlang/syncDBTool
+ ../../syncDBTool
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
@@ -49,33 +49,37 @@
#glog
../../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/mysqlpp/include
+ ../../../BasicPlatForm/libs/mysql/include/mysql/
+ ../../../BasicPlatForm/basic/util/app/
)
link_directories(
#glog
- ../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/glog/lib
/usr/lib/erlang/lib/erl_interface-3.8.2/lib/
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
- ../../BasicPlatForm/libs/crul/lib
- ../../BasicPlatForm/libs/FastDFS/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
- ../../BasicPlatForm/libs/libuuid/lib
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
+ ../../../BasicPlatForm/libs/crul/lib
+ ../../../BasicPlatForm/libs/FastDFS/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/libuuid/lib
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
- ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
- ../../BasicPlatForm/libs/uniview/lib
+ ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
+ ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
+ ../../../BasicPlatForm/libs/uniview/lib
- ../../BasicPlatForm/libs/libboost/lib
+ ../../../BasicPlatForm/libs/libboost/lib
- ../../BasicPlatForm/basic/db/sqlite/
- ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/basic/db/sqlite/
+ ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/libs/mysqlpp/lib
)
add_executable(DataWebServer
@@ -96,6 +100,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 +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
@@ -148,6 +154,7 @@
HCCore
hcnetsdk
pthread
+ mysqlpp
)
#add_executable(Apptest
--
Gitblit v1.8.0