From 2b1a3988c9fd35c39e3e43d0382d65a13c45efee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期四, 14 三月 2019 10:38:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index d4a83d9..0d4e6e6 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,14 +58,15 @@
../StructureApp/NewEncodeVideoManager.cpp
../StructureApp/NewEncodeVideo.cpp
../StructureApp/HiredisTool.cpp
- ../StructureApp/PersonElement.cpp
+ ../StructureApp/PersonElement.cpp
../StructureApp/PerStaticElement.cpp
+ ../StructureApp/IntAreaCalcUtil.cpp
../YoloServer/rpc/YoloServer.cpp
../FaceDetectServer/rpc/FaceServer.cpp
../FaceSearchServer/rpc/FaceSearchServer.cpp
../RecordVideo/rpc/RecordVideo.cpp
-
+ ../VideoToImage/rpc/RtspAnalysServer.cpp
#閫氱敤妯″潡
../../../BasicPlatForm/basic/io/io.cpp
@@ -160,7 +162,7 @@
# cudart
# cublas
opencv_world
- jsoncpp
+# jsoncpp
curl
uuid
pthread
@@ -181,6 +183,7 @@
../YoloServer/rpc
../FaceDetectServer/rpc
../FaceSearchServer/rpc
+ ../VideoToImage/rpc
../../../BasicPlatForm/
@@ -224,7 +227,7 @@
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
../../../BasicPlatForm/libs/libboost/lib
- ../../BasicPlatForm/libs/hiredis-master/lib
+ ../../../BasicPlatForm/libs/hiredis-master/lib/
)
add_executable(${PROJECT_NAME}
--
Gitblit v1.8.0