From ad8ee0872802ba5d0194458bf215a6cc89f4d0d0 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 15:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/VptServer/CMakeLists.txt | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/VptServer/CMakeLists.txt b/QiaoJiaSystem/VptServer/CMakeLists.txt
index 20bb5fd..91e237a 100644
--- a/QiaoJiaSystem/VptServer/CMakeLists.txt
+++ b/QiaoJiaSystem/VptServer/CMakeLists.txt
@@ -36,6 +36,9 @@
VptServerI.cpp
VptDetectWrapper.cpp
./rpc/VptServer.cpp
+
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.h
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
# GlobalSignalWaitLock.hpp
)
@@ -112,3 +115,14 @@
target_link_libraries(${PROJECT_NAME}
${LIBS}
)
+
+
+add_executable(${PROJECT_NAME}demo
+ # testmain.cpp
+ demo.cpp
+ ${SOURCES}
+ )
+
+target_link_libraries(${PROJECT_NAME}demo
+ ${LIBS}
+ )
--
Gitblit v1.8.0