From d5ae54ceb9770963fbe88aa0170c08d0ae648b05 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 16:21:56 +0800
Subject: [PATCH] 删除一些不必要的代码，添加一些注释

---
 QiaoJiaSystem/YoloServer/CMakeLists.txt |  109 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/QiaoJiaSystem/YoloServer/CMakeLists.txt b/QiaoJiaSystem/YoloServer/CMakeLists.txt
index de53fcc..41ce5d1 100644
--- a/QiaoJiaSystem/YoloServer/CMakeLists.txt
+++ b/QiaoJiaSystem/YoloServer/CMakeLists.txt
@@ -22,82 +22,91 @@
     )
 include_directories(
     ./rpc
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/ffmpeg/include
-    ../../BasicPlatForm/libs/DarkNet/include
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/DarkNet/include
     /usr/local/cuda/include/
     /usr/include/x86_64-linux-gnu/qt5
 
     #glog
-    ../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/glog/include
 )
 
 link_directories(
     /usr/local/cuda/lib64
-    ../../BasicPlatForm/libs/jsoncpp/lib
-    ../../BasicPlatForm/libs/openssl/lib/
-    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/DarkNet/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/openssl/lib/
+    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/DarkNet/lib
     #glog
-    ../../BasicPlatForm/libs/glog/lib
+    ../../../BasicPlatForm/libs/glog/lib
 )
 
 link_directories(
     /usr/local/cuda/lib64
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/DarkNet
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/DarkNet
 )
 
 link_directories(
     /usr/local/cuda/lib64
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/DarkNet/lib
-    ../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/DarkNet/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/FastDFS/lib
+    ../../../BasicPlatForm/libs/crul/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/libuuid/lib
 )
 
 add_executable(${PROJECT_NAME}
     main.cpp
     YoloDetectServerI.cpp
+    DnDetect.cpp
     rpc/YoloServer.cpp
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
     )
 
 target_link_libraries(${PROJECT_NAME}
     ${LIBS}
     )
 
-#add_executable(YoloDetectClientTest
-#    ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
-#    ../../BasicPlatForm/basic/util/opencv/CvUtil.h
-#    ../../BasicPlatForm/basic/pipe/PipeConnector.cpp
-#    ../../BasicPlatForm/basic/pipe/PipeConnector.h
-#    ../../BasicPlatForm/basic/pipe/PipeController.cpp
-#    ../../BasicPlatForm/basic/pipe/PipeController.h
-#    ../../BasicPlatForm/basic/pipe/PipeElement.cpp
-#    ../../BasicPlatForm/basic/pipe/PipeElement.h
-#
-#    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
-#    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.h
-#    ../../BasicPlatForm/basic/pipe_element/ImageShowElement.cpp
-#    ../../BasicPlatForm/basic/pipe_element/ImageShowElement.h
-#    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.cpp
-#    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.h
-#    rpc/YoloServer.cpp
-#    YoloDetectClientTest.cpp
-#    YoloRpcElement.cpp
-#    YoloRpcElement.h
-#    ImageDrawElement.cpp
-#    )
-#
-#target_link_libraries(YoloDetectClientTest
-#    Ice
-#    Qt5Core
-#    avformat avcodec avutil avfilter swscale swresample
-#    opencv_world
-#    pthread
-#    )
+
+
+link_directories(
+
+    ../../../BasicPlatForm/libs/FastDFS/lib
+    ../../../BasicPlatForm/libs/crul/lib
+    ../../../BasicPlatForm/libs/libuuid/lib
+)
+include_directories(
+    ./
+    ./rpc
+    #    ../StructureApp
+    ../RapidStructureApp/
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/DarkNet/include
+    /usr/local/cuda/include/
+    /usr/include/x86_64-linux-gnu/qt5
+    ../../../BasicPlatForm/basic/util/fastdfs/
+    ../../../BasicPlatForm/libs/FastDFS/include
+    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+    ../../../BasicPlatForm/basic/pipe/
+    ../../../BasicPlatForm/libs/crul/include
+    ../../../BasicPlatForm/basic/util/curl/
+    ../../../BasicPlatForm/libs/libuuid/include
+
+    #glog
+    ../../../BasicPlatForm/libs/glog/include
+)

--
Gitblit v1.8.0