From 2b1a3988c9fd35c39e3e43d0382d65a13c45efee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期四, 14 三月 2019 10:38:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

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

diff --git a/QiaoJiaSystem/YoloServer/CMakeLists.txt b/QiaoJiaSystem/YoloServer/CMakeLists.txt
index 646fbf1..c170c9e 100644
--- a/QiaoJiaSystem/YoloServer/CMakeLists.txt
+++ b/QiaoJiaSystem/YoloServer/CMakeLists.txt
@@ -70,6 +70,7 @@
     YoloDetectServerI.cpp
     DnDetect.cpp
     rpc/YoloServer.cpp
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
     )
 
 target_link_libraries(${PROJECT_NAME}
@@ -113,8 +114,9 @@
     ../../../BasicPlatForm/libs/libuuid/lib
 )
 include_directories(
+    ./
     ./rpc
-    ../StructureApp
+    #    ../StructureApp
     ../RapidStructureApp/
     ../../../BasicPlatForm
     ../../../BasicPlatForm/libs/opencv/include

--
Gitblit v1.8.0