From e2ec42921840535c445e40b76661d0ffd9baef8f Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2
---
QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
index 8f0f5c9..8ab10c9 100644
--- a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
@@ -13,7 +13,7 @@
Ice
crypto
-
+ mysqlpp
#ffmpeg
avformat
@@ -74,6 +74,9 @@
../../BasicPlatForm/libs/hiredis-master/include
../../../BasicPlatForm/basic/timer_counter/
../../../BasicPlatForm/libs/GB28181/include
+
+ ../../../BasicPlatForm/libs/mysqlpp/include
+ ../../../BasicPlatForm/libs/mysql/include/mysql/
)
link_directories(
@@ -89,15 +92,19 @@
../../../BasicPlatForm/libs/Ice-3.7.0/lib64
../../../BasicPlatForm/libs/hiredis-master/lib
+ ../../../BasicPlatForm/libs/mysqlpp/lib
+ ../../../BasicPlatForm/libs/mysql/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