From 99221e4721a1246883465c2b52fbff14eb9aaa7a Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

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

diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index b6d0bd7..1afbdbf 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,7 +58,7 @@
     ../StructureApp/NewEncodeVideoManager.cpp
     ../StructureApp/NewEncodeVideo.cpp
     ../StructureApp/HiredisTool.cpp
-     ../StructureApp/PersonElement.cpp
+    ../StructureApp/PersonElement.cpp
     ../StructureApp/PerStaticElement.cpp
     ../StructureApp/IntAreaCalcUtil.cpp
 
@@ -161,7 +162,7 @@
     #    cudart
     #    cublas
     opencv_world
-    jsoncpp
+#    jsoncpp
     curl
     uuid
     pthread

--
Gitblit v1.8.0