From ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:12:15 +0800
Subject: [PATCH] Merge svn 3352
---
QiaoJiaSystem/RecordVideo/CMakeLists.txt | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/QiaoJiaSystem/RecordVideo/CMakeLists.txt b/QiaoJiaSystem/RecordVideo/CMakeLists.txt
index 5aa4879..732118d 100644
--- a/QiaoJiaSystem/RecordVideo/CMakeLists.txt
+++ b/QiaoJiaSystem/RecordVideo/CMakeLists.txt
@@ -17,11 +17,11 @@
../VideoServer/QiaoJia/DB/LDBTool.cpp
./VideoRecorder.cpp
./CommonFFmpegFunc.hpp
- ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
- ../../BasicPlatForm/basic/util/app/AppConfig.h
- ../../BasicPlatForm/basic/util/app/AppPreference.hpp
- ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
- ../../BasicPlatForm/basic/pipe/TimerElement.cpp
+ ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+ ../../../BasicPlatForm/basic/util/app/AppConfig.h
+ ../../../BasicPlatForm/basic/util/app/AppPreference.hpp
+ ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+ ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
)
SET(LIBS
@@ -46,35 +46,35 @@
include_directories(
./rpc
- ../../BasicPlatForm
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/libs/FastDFS/include/fastcommon
- ../../BasicPlatForm/libs/FastDFS/include/fastdfs
- ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder
- ../../BasicPlatForm/basic/pipe
- ../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/libs/glog/include
- ../../BasicPlatForm/libs/libuuid/include
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+ ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder
+ ../../../BasicPlatForm/basic/pipe
+ ../../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/libuuid/include
/usr/include/x86_64-linux-gnu/qt5
/usr/include/x86_64-linux-gnu/qt5/QtCore/
/usr/include/x86_64-linux-gnu/qt5/QtSql/
#glog
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/glog/include
)
link_directories(
#glog
- ../../BasicPlatForm/libs/glog/lib
- ../../BasicPlatForm/libs/Ice-3.7.0/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
- ../../BasicPlatForm/libs/FastDFS/lib
- ../../BasicPlatForm/libs/openssl/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/libuuid/lib
+ ../../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/FastDFS/lib
+ ../../../BasicPlatForm/libs/openssl/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/libuuid/lib
)
--
Gitblit v1.8.0