From f53e1204bd4a21f74cb5872030f1eadf231eedc7 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 05 一月 2019 19:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/CMakeLists.txt | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 663a782..2dc1314 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -8,11 +8,13 @@
SET(SOURCES
- # HiredisTool.cpp
+
NewRecordVideoElement.cpp
JudgmentRetrogradeTool.cpp
PerimeterElement.cpp
-
+ NewEncodeVideoManager.cpp
+ NewEncodeVideo.cpp
+ HiredisTool.cpp
TrackingTrigger.cpp
FaceRpcElement.cpp
@@ -64,6 +66,8 @@
curl
fastcommon
fdfsclient
+
+ hiredis
)
include_directories(
@@ -93,6 +97,8 @@
../../../BasicPlatForm/libs/glog/include
/usr/include/x86_64-linux-gnu/qt5
/usr/include/x86_64-linux-gnu/qt5/QtCore
+
+ ../../BasicPlatForm/libs/hiredis-master/include
)
link_directories(
@@ -107,6 +113,8 @@
../../../BasicPlatForm/libs/glog/lib
../../../BasicPlatForm/libs/crul/lib
+
+ ../../BasicPlatForm/libs/hiredis-master/lib
)
add_executable(${PROJECT_NAME}
--
Gitblit v1.8.0