From ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:12:15 +0800
Subject: [PATCH] Merge svn 3352
---
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 3502803..9e4b341 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
@@ -54,28 +54,28 @@
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
)
add_executable(DataWebServer
@@ -96,6 +96,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
--
Gitblit v1.8.0