From 9a0afe1ccce6fd3a6882b4c19b72cee579a54dd1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 12:57:51 +0800
Subject: [PATCH] find channel list bug
---
QiaoJiaSystem/StructureApp/CMakeLists.txt | 98 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 901e914..b15b23e 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -8,11 +8,16 @@
SET(SOURCES
-# HiredisTool.cpp
+ # HiredisTool.cpp
NewRecordVideoElement.cpp
JudgmentRetrogradeTool.cpp
PerimeterElement.cpp
-
+ NewEncodeVideoManager.cpp
+ NewEncodeVideo.cpp
+ HiredisTool.cpp
+ PersonElement.cpp
+ PerStaticElement.cpp
+ IntAreaCalcUtil.cpp
TrackingTrigger.cpp
FaceRpcElement.cpp
@@ -26,17 +31,19 @@
../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
- ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
- ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
- ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
- ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
- ../../BasicPlatForm/basic/pipe/TimerElement.cpp
- ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
- ../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
- ../../BasicPlatForm/basic/util/net_config/net_config.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
+ ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+ ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+ ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+ ../../../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 +71,8 @@
curl
fastcommon
fdfsclient
+
+ hiredis
)
include_directories(
@@ -72,41 +81,47 @@
../RecordVideo/rpc
../FaceDetectServer/rpc
../FaceSearchServer/rpc
+ ../VideoToImage/rpc
../RapidStructureApp/
- ../../BasicPlatForm
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/basic/util/net_config/
- ../../BasicPlatForm/basic/util/fastdfs/
- ../../BasicPlatForm/libs/FastDFS/include
- ../../BasicPlatForm/libs/FastDFS/include/fastdfs
- ../../BasicPlatForm/libs/FastDFS/include/fastcommon
+ ../../../BasicPlatForm/basic/util/net_config/
+ ../../../BasicPlatForm/basic/util/fastdfs/
+ ../../../BasicPlatForm/libs/FastDFS/include
+ ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+ ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
- ../../BasicPlatForm/basic/pipe/
- ../../BasicPlatForm/libs/crul/include
- ../../BasicPlatForm/basic/util/curl/
- ../../BasicPlatForm/libs/libuuid/include
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/basic/pipe/
+ ../../../BasicPlatForm/libs/crul/include
+ ../../../BasicPlatForm/basic/util/curl/
+ ../../../BasicPlatForm/libs/libuuid/include
+ ../../../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(
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/Ice-3.7.0/lib64
- ../../BasicPlatForm/libs/openssl/lib
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/FastDFS/lib
- ../../BasicPlatForm/libs/libuuid/lib
+ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+ ../../../BasicPlatForm/libs/openssl/lib
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/FastDFS/lib
+ ../../../BasicPlatForm/libs/libuuid/lib
- ../../BasicPlatForm/libs/glog/lib
- ../../BasicPlatForm/libs/crul/lib
+ ../../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/crul/lib
+
+ ../../../BasicPlatForm/libs/hiredis-master/lib
)
add_executable(${PROJECT_NAME}
@@ -114,14 +129,13 @@
${SOURCES}
)
-add_executable(AppPipeControllerTest
- AppPipeControllerTest.cpp
- ${SOURCES})
-
target_link_libraries(${PROJECT_NAME}
${LIBS}
)
-target_link_libraries(AppPipeControllerTest
- ${LIBS}
- )
+#add_executable(AppPipeControllerTest
+# AppPipeControllerTest.cpp
+# ${SOURCES})
+#target_link_libraries(AppPipeControllerTest
+# ${LIBS}
+# )
--
Gitblit v1.8.0