From 2bef72df0afa4f123365fb01fa961f9feabf0e45 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期三, 06 三月 2019 11:49:38 +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/VideoAnalysFromHC/CMakeLists.txt | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 1d8f81c..d0067c6 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -54,12 +54,18 @@
../StructureApp/PerimeterElement.cpp
../StructureApp/NewRecordVideoElement.cpp
+ ../StructureApp/NewEncodeVideoManager.cpp
+ ../StructureApp/NewEncodeVideo.cpp
+ ../StructureApp/HiredisTool.cpp
+ ../StructureApp/PersonElement.cpp
+ ../StructureApp/PerStaticElement.cpp
+ ../StructureApp/IntAreaCalcUtil.cpp
../YoloServer/rpc/YoloServer.cpp
../FaceDetectServer/rpc/FaceServer.cpp
../FaceSearchServer/rpc/FaceSearchServer.cpp
../RecordVideo/rpc/RecordVideo.cpp
-
+ ../VideoToImage/rpc/RtspAnalysServer.cpp
#閫氱敤妯″潡
../../../BasicPlatForm/basic/io/io.cpp
@@ -74,6 +80,7 @@
../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
#绾跨▼姹�
myThread.cpp
@@ -158,6 +165,7 @@
curl
uuid
pthread
+ hiredis
)
include_directories(
@@ -174,6 +182,7 @@
../YoloServer/rpc
../FaceDetectServer/rpc
../FaceSearchServer/rpc
+ ../VideoToImage/rpc
../../../BasicPlatForm/
@@ -199,6 +208,8 @@
/usr/include/x86_64-linux-gnu/qt5
/usr/include/x86_64-linux-gnu/qt5/QtCore/
/usr/include/x86_64-linux-gnu/qt5/QtSql/
+
+ ../../BasicPlatForm/libs/hiredis-master/include
)
link_directories(
@@ -215,6 +226,7 @@
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
../../../BasicPlatForm/libs/libboost/lib
+ ../../../BasicPlatForm/libs/hiredis-master/lib/
)
add_executable(${PROJECT_NAME}
--
Gitblit v1.8.0