From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
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