From 30d0bd43f53740554e8387fcd14bfab689eeca9c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 25 一月 2019 21:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature

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

diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 2da842a..24bb196 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -16,12 +16,13 @@
 
 add_subdirectory(StructureApp)
 add_subdirectory(FaceDetectServer)
-#add_subdirectory(YoloServer)
+add_subdirectory(YoloServer)
 add_subdirectory(FaceSearchServer)
 add_subdirectory(VideoAnalysFromHC)
 add_subdirectory(RapidStructureApp)
 add_subdirectory(RecordVideo)
 add_subdirectory(DataManagerServer)
+add_subdirectory(EncodeServer)
 
 
 #add_subdirectory(FaceSearchDbWithImg)

--
Gitblit v1.8.0