Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 QiaoJiaSystem/StructureApp/CMakeLists.txt

@@ -12,7 +12,11 @@
    NewRecordVideoElement.cpp
    JudgmentRetrogradeTool.cpp
    PerimeterElement.cpp

    NewEncodeVideoManager.cpp
    NewEncodeVideo.cpp
    HiredisTool.cpp
    PersonElement.cpp
    PerStaticElement.cpp

    TrackingTrigger.cpp
    FaceRpcElement.cpp
@@ -37,6 +41,7 @@
    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
    ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

SET(LIBS
@@ -64,6 +69,8 @@
    curl
    fastcommon
    fdfsclient

    hiredis
    )

include_directories(
@@ -93,6 +100,9 @@
    ../../../BasicPlatForm/libs/glog/include
    /usr/include/x86_64-linux-gnu/qt5
    /usr/include/x86_64-linux-gnu/qt5/QtCore

    ../../BasicPlatForm/libs/hiredis-master/include
    ../VideoServer/QiaoJia/DB
)

link_directories(
@@ -107,6 +117,8 @@

    ../../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/crul/lib

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

add_executable(${PROJECT_NAME}