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 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index d774952..9e4b341 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -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