Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 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}