From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature

---
 QiaoJiaSystem/StructureApp/CMakeLists.txt |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 2dc1314..393119d 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -8,13 +8,16 @@
 
 SET(SOURCES
 
-
+    #    HiredisTool.cpp
     NewRecordVideoElement.cpp
     JudgmentRetrogradeTool.cpp
     PerimeterElement.cpp
     NewEncodeVideoManager.cpp
     NewEncodeVideo.cpp
     HiredisTool.cpp
+    PersonElement.cpp
+    PerStaticElement.cpp
+    IntAreaCalcUtil.cpp
 
     TrackingTrigger.cpp
     FaceRpcElement.cpp
@@ -39,6 +42,7 @@
     ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
     ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
     ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
     )
 
 SET(LIBS
@@ -99,6 +103,7 @@
     /usr/include/x86_64-linux-gnu/qt5/QtCore
 
     ../../BasicPlatForm/libs/hiredis-master/include
+    ../VideoServer/QiaoJia/DB
 )
 
 link_directories(

--
Gitblit v1.8.0