From ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:12:15 +0800
Subject: [PATCH] Merge svn 3352
---
QiaoJiaSystem/StructureApp/CMakeLists.txt | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 663a782..a06601a 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -12,7 +12,11 @@
NewRecordVideoElement.cpp
JudgmentRetrogradeTool.cpp
PerimeterElement.cpp
-
+ NewEncodeVideoManager.cpp
+ NewEncodeVideo.cpp
+ HiredisTool.cpp
+ PersonElement.cpp
+ PerStaticElement.cpp
TrackingTrigger.cpp
FaceRpcElement.cpp
@@ -37,6 +41,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
@@ -64,6 +69,8 @@
curl
fastcommon
fdfsclient
+
+ hiredis
)
include_directories(
@@ -93,6 +100,9 @@
../../../BasicPlatForm/libs/glog/include
/usr/include/x86_64-linux-gnu/qt5
/usr/include/x86_64-linux-gnu/qt5/QtCore
+
+ ../../BasicPlatForm/libs/hiredis-master/include
+ ../VideoServer/QiaoJia/DB
)
link_directories(
@@ -107,6 +117,8 @@
../../../BasicPlatForm/libs/glog/lib
../../../BasicPlatForm/libs/crul/lib
+
+ ../../BasicPlatForm/libs/hiredis-master/lib
)
add_executable(${PROJECT_NAME}
--
Gitblit v1.8.0