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/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