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

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 QiaoJiaSystem/RapidStructureApp/CMakeLists.txt

@@ -16,6 +16,7 @@
    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
    ../../../BasicPlatForm/basic/util/file/FileUtil.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

SET(LIBS