From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块

---
 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 8900ba4..26f313c 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
@@ -105,6 +105,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