From 6e1fff143f2669f7771301d583fff99de7995cdd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期二, 05 三月 2019 09:21:02 +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/CMakeLists.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 5aad5c3..a2e7f1d 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -12,8 +12,14 @@
./
../../BasicPlatForm/
../../BasicPlatForm/libs/jsoncpp/include
+ ../../BasicPlatForm/libs/glog/include
../../BasicPlatForm/libs/opencv/include
../../BasicPlatForm/libs/libuuid/include
+)
+
+
+link_directories(
+ ../../BasicPlatForm/libs/glog/lib
)
#add_subdirectory(StructureApp)
@@ -28,5 +34,6 @@
#add_subdirectory(VideoToImage)
add_subdirectory(UnitTest)
add_subdirectory(VideoToImageMulth)
+add_subdirectory(GB28181DecoderModel)
#add_subdirectory(FaceSearchDbWithImg)
--
Gitblit v1.8.0