Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 QiaoJiaSystem/YoloServer/CMakeLists.txt

@@ -22,43 +22,43 @@
    )
include_directories(
    ./rpc
    ../../BasicPlatForm
    ../../BasicPlatForm/libs/opencv/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/ffmpeg/include
    ../../BasicPlatForm/libs/DarkNet/include
    ../../../BasicPlatForm
    ../../../BasicPlatForm/libs/opencv/include
    ../../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/ffmpeg/include
    ../../../BasicPlatForm/libs/DarkNet/include
    /usr/local/cuda/include/
    /usr/include/x86_64-linux-gnu/qt5

    #glog
    ../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/glog/include
)

link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../BasicPlatForm/libs/openssl/lib/
    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/DarkNet/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/openssl/lib/
    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/DarkNet/lib
    #glog
    ../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/glog/lib
)

link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/DarkNet
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/DarkNet
)

link_directories(
    /usr/local/cuda/lib64
    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../BasicPlatForm/libs/DarkNet/lib
    ../../BasicPlatForm/libs/ffmpeg/lib
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Ice-3.7.0/include
    ../../../BasicPlatForm/libs/DarkNet/lib
    ../../../BasicPlatForm/libs/ffmpeg/lib
)

add_executable(${PROJECT_NAME}