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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 2dc1314..b15b23e 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
@@ -28,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
@@ -39,6 +43,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
@@ -76,6 +81,7 @@
../RecordVideo/rpc
../FaceDetectServer/rpc
../FaceSearchServer/rpc
+ ../VideoToImage/rpc
../RapidStructureApp/
../../../BasicPlatForm
@@ -99,6 +105,7 @@
/usr/include/x86_64-linux-gnu/qt5/QtCore
../../BasicPlatForm/libs/hiredis-master/include
+ ../VideoServer/QiaoJia/DB
)
link_directories(
@@ -114,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