From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

---
 QiaoJiaSystem/CMakeLists.txt |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 8dcb3f2..400e343 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -8,15 +8,15 @@
 
 include_directories(
     ./
-    ../BasicPlatForm/
-    ../BasicPlatForm/libs/jsoncpp/include
-    ../BasicPlatForm/libs/opencv/include
-    ../BasicPlatForm/libs/libuuid/include
+    ../../BasicPlatForm/
+    ../../BasicPlatForm/libs/jsoncpp/include
+    ../../BasicPlatForm/libs/opencv/include
+    ../../BasicPlatForm/libs/libuuid/include
 )
 
 add_subdirectory(StructureApp)
 add_subdirectory(FaceDetectServer)
-#add_subdirectory(YoloServer)
+add_subdirectory(YoloServer)
 add_subdirectory(FaceSearchServer)
 add_subdirectory(VideoAnalysFromHC)
 add_subdirectory(RapidStructureApp)

--
Gitblit v1.8.0