From c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:03:50 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.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