From 25f94726888e19d6efed7b393217d9f56a0ca767 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 18:44:46 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
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