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/DataManagerServer/CMakeLists.txt | 128 +++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 51 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 46bbeb2..77fd0e8 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -53,6 +53,12 @@
../../../BasicPlatForm/libs/mysql/include/mysql/
../../../BasicPlatForm/basic/util/app/
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/
+ ../../../BasicPlatForm/libs/EvnsqTool/include
+ ../../../BasicPlatForm/libs/libevent/include
+
+
)
link_directories(
@@ -81,6 +87,10 @@
../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
../../../BasicPlatForm/libs/mysqlpp/lib
../../../BasicPlatForm/libs/mysql/lib
+
+ #nsq
+ ../../../BasicPlatForm/libs/EvnsqTool/lib
+ ../../../BasicPlatForm/libs/libevent/lib
)
add_executable(DataWebServer
@@ -104,14 +114,14 @@
../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
-
../../syncDBTool/ErlangDbTool.cpp
#
../LocalDBTool/GetUUId.cpp
../LocalDBTool/SqliteFaceEncap.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
- vss/dao/BaseDao.cpp)
+ vss/dao/BaseDao.cpp
+ )
target_link_libraries(DataWebServer
glog
@@ -157,55 +167,71 @@
pthread
mysqlpp
mysqlclient
+
+ #mq
+ event
+ evnsq
+ evpp_concurrentqueue
)
-#add_executable(Apptest
-# demo.cpp
-# ./AppPipeController.cpp
-# ./AppPipeController.h
-#
-# ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
-# ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-# ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
-# ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
-# ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
-# ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-# ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
-# )
-#
-#target_link_libraries(Apptest
-# boost_system
-# boost_thread
-# boost_filesystem
-# ei
-# erl_interface_st
-# ei_st
-# erl_interface
-# # uuid
-# rt
-# pthread
-# avformat
-# avcodec
-# swresample
-# swscale
-# avutil
-# bz2 dl z
-#
-# opencv_world
-# THFaceImage
-# THFeature
-# THFaceProperty
-#
-# curl
-# fastcommon
-# fdfsclient
-#
-# Qt5Core
-# Qt5Sql
-#
-# jsoncpp
-#
-# HCCore
-# hcnetsdk
-# )
+add_executable(demo
+ demo.cpp
+ ./AppPipeController.cpp
+ ./AppPipeController.h
+ ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+ ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
+ )
+
+target_link_libraries(demo
+ glog
+ boost_system
+ boost_thread
+ boost_filesystem
+ ei
+ erl_interface_st
+ ei_st
+ erl_interface
+ uuid
+ rt
+ avformat
+ avcodec
+ swresample
+ swscale
+ avutil
+ bz2 dl z
+
+ opencv_world
+ THFaceImage
+ THFeature
+ THFaceProperty
+
+ curl
+ fastcommon
+ fdfsclient
+
+ Qt5Core
+ Qt5Sql
+ sqlite3
+
+ jsoncpp
+
+ imos_mw_sdk
+ mw_sdk_player
+ mw_sdk_ipc
+ mw_sdk_bp
+ mw_sdk_rm
+
+ HCCore
+ hcnetsdk
+ pthread
+ mysqlpp
+ mysqlclient
+
+ #mq
+ event
+ evnsq
+ evpp_concurrentqueue
+ )
--
Gitblit v1.8.0