From fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 20:22:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2
---
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