From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3
---
QiaoJiaSystem/RapidStructureApp/CMakeLists.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
index a37d457..1685bb6 100644
--- a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
+++ b/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
--
Gitblit v1.8.0