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/StructureApp/CMakeLists.txt |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index a06601a..b15b23e 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -17,6 +17,7 @@
     HiredisTool.cpp
     PersonElement.cpp
     PerStaticElement.cpp
+    IntAreaCalcUtil.cpp
 
     TrackingTrigger.cpp
     FaceRpcElement.cpp
@@ -30,6 +31,7 @@
     ../FaceDetectServer/rpc/FaceServer.cpp
     ../FaceSearchServer/rpc/FaceSearchServer.cpp
     ../RecordVideo/rpc/RecordVideo.cpp
+    ../VideoToImage/rpc/RtspAnalysServer.cpp
     ../RapidStructureApp/TriggerElement.cpp
 
     ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
@@ -79,6 +81,7 @@
     ../RecordVideo/rpc
     ../FaceDetectServer/rpc
     ../FaceSearchServer/rpc
+    ../VideoToImage/rpc
     ../RapidStructureApp/
 
     ../../../BasicPlatForm
@@ -118,7 +121,7 @@
     ../../../BasicPlatForm/libs/glog/lib
     ../../../BasicPlatForm/libs/crul/lib
 
-     ../../BasicPlatForm/libs/hiredis-master/lib
+    ../../../BasicPlatForm/libs/hiredis-master/lib
 )
 
 add_executable(${PROJECT_NAME}

--
Gitblit v1.8.0