From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24: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/CMakeLists.txt | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 24bb196..1db175e 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -4,26 +4,36 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_BUILD_TYPE debug)
+add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
+add_definitions(-DGLOG)
add_definitions(-fpermissive)
include_directories(
./
../../BasicPlatForm/
../../BasicPlatForm/libs/jsoncpp/include
+ ../../BasicPlatForm/libs/glog/include
../../BasicPlatForm/libs/opencv/include
../../BasicPlatForm/libs/libuuid/include
)
-add_subdirectory(StructureApp)
+
+link_directories(
+ ../../BasicPlatForm/libs/glog/lib
+)
+
+#add_subdirectory(StructureApp)
add_subdirectory(FaceDetectServer)
add_subdirectory(YoloServer)
add_subdirectory(FaceSearchServer)
add_subdirectory(VideoAnalysFromHC)
-add_subdirectory(RapidStructureApp)
-add_subdirectory(RecordVideo)
+#add_subdirectory(RapidStructureApp)
+#add_subdirectory(RecordVideo)
add_subdirectory(DataManagerServer)
-add_subdirectory(EncodeServer)
-
-
+#add_subdirectory(EncodeServer)
+#add_subdirectory(VideoToImage)
+add_subdirectory(UnitTest)
+add_subdirectory(VideoToImageMulth)
+#add_subdirectory(GB28181DecoderModel)
#add_subdirectory(FaceSearchDbWithImg)
--
Gitblit v1.8.0