From f53e1204bd4a21f74cb5872030f1eadf231eedc7 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 05 一月 2019 19:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/VideoServer/CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/CMakeLists.txt b/QiaoJiaSystem/VideoServer/CMakeLists.txt
index f7cd8a7..fd8cdf2 100644
--- a/QiaoJiaSystem/VideoServer/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoServer/CMakeLists.txt
@@ -16,14 +16,14 @@
/usr/include/x86_64-linux-gnu/qt5/QtCore/
/usr/include/x86_64-linux-gnu/qt5/QtSql/
- ../../BasicPlatForm/
+ ../../../BasicPlatForm/
./QiaoJia/DB
./QiaoJia/dispatchTool
)
link_directories(
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/opencv/lib
)
add_executable(${PROJECT_NAME}
--
Gitblit v1.8.0