Merge remote-tracking branch 'origin/feature_addPersonTracking' into featur...

pansen

2018-12-26 4001288af80a5e07bb96dd2a7d41d7cb0052a560

 QiaoJiaSystem/FaceDetectServer/CMakeLists.txt

@@ -26,7 +26,6 @@
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/wrapper/casia/include
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
    /usr/include/x86_64-linux-gnu/qt5
    #glog