From e1d7e82725a6ee591b399f89544b64a4f07b624d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 26 十二月 2018 15:06:14 +0800
Subject: [PATCH] Merge branch 'Develop'
---
QiaoJiaSystem/RapidStructureApp/CMakeLists.txt | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
index a96af7a..a37d457 100644
--- a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
@@ -12,10 +12,10 @@
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
)
SET(LIBS
@@ -37,21 +37,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