Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31

 QiaoJiaSystem/FaceDetectServer/CMakeLists.txt

@@ -49,15 +49,18 @@
    main_detect.cpp
    FaceDetectServerI.cpp
    rpc/FaceServer.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )
add_executable(FaceDetectResourcesTest
    FaceDetectResourcesTest.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

add_executable(FaceExtractServer
    main_extract.cpp
    FaceExtractServerI.cpp
    rpc/FaceServer.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

target_link_libraries(${PROJECT_NAME}