From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码

---
 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index b6d0bd7..65da203 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -9,6 +9,7 @@
 set(CMAKE_BUILD_TYPE debug)
 add_compile_options(-fPIC)
 add_definitions(-DGLOG)
+#add_definitions(-DGB28181)
 add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
 SET(SOURCES
 
@@ -57,10 +58,12 @@
     ../StructureApp/NewEncodeVideoManager.cpp
     ../StructureApp/NewEncodeVideo.cpp
     ../StructureApp/HiredisTool.cpp
-     ../StructureApp/PersonElement.cpp
+    ../StructureApp/PersonElement.cpp
     ../StructureApp/PerStaticElement.cpp
     ../StructureApp/IntAreaCalcUtil.cpp
+    ../StructureApp/VptRpcElement.cpp
 
+    ../VptServer/rpc/VptServer.cpp
     ../YoloServer/rpc/YoloServer.cpp
     ../FaceDetectServer/rpc/FaceServer.cpp
     ../FaceSearchServer/rpc/FaceSearchServer.cpp
@@ -161,11 +164,15 @@
     #    cudart
     #    cublas
     opencv_world
-    jsoncpp
+    #    jsoncpp
     curl
     uuid
     pthread
     hiredis
+    #mq
+    event
+    evnsq
+    evpp_concurrentqueue
     )
 include_directories(
 
@@ -177,6 +184,7 @@
     ../VideoServer/QiaoJia/DB
     ../VideoServer/QiaoJia/dispatchTool
 
+    ../VptServer/rpc
     ../RecordVideo/rpc
     ../StructureApp/rpc
     ../YoloServer/rpc
@@ -210,6 +218,9 @@
     /usr/include/x86_64-linux-gnu/qt5/QtSql/
 
     ../../BasicPlatForm/libs/hiredis-master/include
+    #nsq
+    ../../../BasicPlatForm/libs/EvnsqTool/include
+    ../../../BasicPlatForm/libs/libevent/include
 )
 
 link_directories(
@@ -227,6 +238,9 @@
     ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
     ../../../BasicPlatForm/libs/libboost/lib
     ../../../BasicPlatForm/libs/hiredis-master/lib/
+    #nsq
+    ../../../BasicPlatForm/libs/EvnsqTool/lib
+    ../../../BasicPlatForm/libs/libevent/lib
 )
 
 add_executable(${PROJECT_NAME}

--
Gitblit v1.8.0