From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/FaceSearchServer/CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 8900ba4..5860601 100644
--- a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
@@ -73,7 +73,7 @@
../../../BasicPlatForm/libs/Ice-3.7.0/lib64
../../../BasicPlatForm/libs/opencv/lib
../../../BasicPlatForm/libs/ffmpeg/lib
- ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
../../../BasicPlatForm/libs/crul/lib
../../../BasicPlatForm/libs/jsoncpp/lib
../../../BasicPlatForm/libs/libuuid/lib
@@ -89,7 +89,6 @@
add_executable(${PROJECT_NAME}
main.cpp
rpc/FaceSearchServer.cpp
- FaceSearchServerResources.cpp
FaceFeatureSearchServerI.cpp
FaceFeatureSearchServerI.h
CasiaFaceWrapper/CasiaFaceWrapperN.cpp
@@ -105,6 +104,7 @@
../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.h
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
../LocalDBTool/SqliteFaceEncap.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
--
Gitblit v1.8.0