Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

 QiaoJiaSystem/CMakeLists.txt

@@ -8,10 +8,10 @@

include_directories(
    ./
    ../BasicPlatForm/
    ../BasicPlatForm/libs/jsoncpp/include
    ../BasicPlatForm/libs/opencv/include
    ../BasicPlatForm/libs/libuuid/include
    ../../BasicPlatForm/
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/libuuid/include
)

add_subdirectory(StructureApp)