From 99221e4721a1246883465c2b52fbff14eb9aaa7a Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

---
 QiaoJiaSystem/YoloServer/CMakeLists.txt |  110 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/QiaoJiaSystem/YoloServer/CMakeLists.txt b/QiaoJiaSystem/YoloServer/CMakeLists.txt
index ff8a39e..c170c9e 100644
--- a/QiaoJiaSystem/YoloServer/CMakeLists.txt
+++ b/QiaoJiaSystem/YoloServer/CMakeLists.txt
@@ -59,45 +59,95 @@
     ../../../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
-#    )
+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/timer_counter/Clocktimer.h
+    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
+
+    ../../../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
+    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+    ../RapidStructureApp/TriggerElement.cpp
+    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
+    ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
+    rpc/YoloServer.cpp
+    YoloDetectClientTest.cpp
+    ./YoloRpcElement.cpp
+    ./YoloRpcElement.h
+    ImageDrawElement.cpp
+    )
+
+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
+)
+target_link_libraries(YoloDetectClientTest
+    Ice
+    Qt5Core
+    avformat avcodec avutil avfilter swscale swresample
+    opencv_world
+    curl
+    uuid
+    jsoncpp
+    fastcommon
+    fdfsclient
+    glog
+    pthread
+    )

--
Gitblit v1.8.0