From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
index 8b92de1..a87a32b 100644
--- a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
@@ -39,6 +39,10 @@
28181sdk
mysqlclient
StreamParse
+ #mq
+ event
+ evnsq
+ evpp_concurrentqueue
)
include_directories(
@@ -77,6 +81,10 @@
../../../BasicPlatForm/libs/mysqlpp/include
../../../BasicPlatForm/libs/mysql/include/mysql/
+
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/include
+ ../../../BasicPlatForm/libs/libevent/include
)
link_directories(
@@ -93,15 +101,22 @@
../../../BasicPlatForm/libs/hiredis-master/lib
../../../BasicPlatForm/libs/mysqlpp/lib
+ ../../../BasicPlatForm/libs/mysql/lib
+
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/lib
+ ../../../BasicPlatForm/libs/libevent/lib
)
add_executable(${PROJECT_NAME}
+
+ ./pushStream/PushStreamAppPipeController.cpp
../GB28181DecoderModel/FFmpegDecoderJPG.cpp
../GB28181DecoderModel/GB28181Server.cpp
../GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
- ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ # ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
- # ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+# ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
../VideoServer/QiaoJia/DB/LDBTool.cpp
./rpc/RtspAnalysServer.cpp
RtspCaptureElement.cpp
--
Gitblit v1.8.0