From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:12:41 +0800
Subject: [PATCH] 合并代码解决冲突
---
QiaoJiaSystem/FaceDetectServer/CMakeLists.txt | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
index 918457d..b4b8421 100644
--- a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
@@ -49,15 +49,18 @@
main_detect.cpp
FaceDetectServerI.cpp
rpc/FaceServer.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
add_executable(FaceDetectResourcesTest
FaceDetectResourcesTest.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
add_executable(FaceExtractServer
main_extract.cpp
FaceExtractServerI.cpp
rpc/FaceServer.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
target_link_libraries(${PROJECT_NAME}
--
Gitblit v1.8.0