Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-10 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc

 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}