Merge branch 'Develop'

pansen

2018-12-26 e1d7e82725a6ee591b399f89544b64a4f07b624d

 QiaoJiaSystem/VideoServer/CMakeLists.txt

@@ -16,14 +16,14 @@
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
    /usr/include/x86_64-linux-gnu/qt5/QtSql/

    ../../BasicPlatForm/
    ../../../BasicPlatForm/
    ./QiaoJia/DB
    ./QiaoJia/dispatchTool
)

link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/opencv/lib
    )

add_executable(${PROJECT_NAME}