Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt

@@ -54,6 +54,11 @@
    ../StructureApp/PerimeterElement.cpp

    ../StructureApp/NewRecordVideoElement.cpp
    ../StructureApp/NewEncodeVideoManager.cpp
    ../StructureApp/NewEncodeVideo.cpp
    ../StructureApp/HiredisTool.cpp
     ../StructureApp/PersonElement.cpp
    ../StructureApp/PerStaticElement.cpp

    ../YoloServer/rpc/YoloServer.cpp
    ../FaceDetectServer/rpc/FaceServer.cpp
@@ -74,6 +79,7 @@
    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp

    #线程池
    myThread.cpp
@@ -158,6 +164,7 @@
    curl
    uuid
    pthread
    hiredis
    )
include_directories(

@@ -199,6 +206,8 @@
    /usr/include/x86_64-linux-gnu/qt5
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
    /usr/include/x86_64-linux-gnu/qt5/QtSql/

    ../../BasicPlatForm/libs/hiredis-master/include
)

link_directories(
@@ -215,6 +224,7 @@
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
    ../../../BasicPlatForm/libs/libboost/lib
    ../../BasicPlatForm/libs/hiredis-master/lib
)

add_executable(${PROJECT_NAME}