Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 QiaoJiaSystem/YoloServer/CMakeLists.txt

@@ -65,6 +65,7 @@
    main.cpp
    YoloDetectServerI.cpp
    rpc/YoloServer.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

target_link_libraries(${PROJECT_NAME}
@@ -87,6 +88,7 @@
#    ../../BasicPlatForm/basic/pipe_element/ImageShowElement.h
#    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.cpp
#    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.h
#    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
#    rpc/YoloServer.cpp
#    YoloDetectClientTest.cpp
#    YoloRpcElement.cpp