From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块

---
 QiaoJiaSystem/RapidStructureApp/CMakeLists.txt |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
index a96af7a..1685bb6 100644
--- a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
@@ -12,10 +12,11 @@
     VideoChangeScore.cpp
     TriggerElement.cpp
     AppController.cpp
-    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
-    ../../BasicPlatForm/basic/pipe/TimerElement.cpp
-    ../../BasicPlatForm/basic/util/file/FileUtil.cpp
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
+    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+    ../../../BasicPlatForm/basic/util/file/FileUtil.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
     )
 
 SET(LIBS
@@ -37,21 +38,21 @@
     ../YoloServer/rpc
     ../FaceDetectServer/rpc
     ../StructureApp
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/ffmpeg/include
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/basic/pipe/
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/basic/pipe/
     /usr/include/x86_64-linux-gnu/qt5
 )
 
 link_directories(
-    ../../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/Ice-3.7.0/lib64
+    ../../../BasicPlatForm/libs/openssl/lib
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
 )
 
 add_executable(${PROJECT_NAME}

--
Gitblit v1.8.0