Merge branch 'ywv12' into ywv1.2

pansen

2019-02-20 5bff300cf314e7e61c6db75d634ef6a00add48e6

 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}