提交 5d8f8d00 authored 作者: blu's avatar blu

nop

上级 1e162fa4
...@@ -49,13 +49,14 @@ add_library(zmqhelper STATIC inc/zmqhelper.cpp) ...@@ -49,13 +49,14 @@ add_library(zmqhelper STATIC inc/zmqhelper.cpp)
add_library(dirmon STATIC dirmon.cpp) add_library(dirmon STATIC dirmon.cpp)
add_library(post STATIC postfile.cpp) add_library(post STATIC postfile.cpp)
add_library(util STATIC inc/utils.cpp) add_library(util STATIC inc/utils.cpp)
add_library(mqtthelper STATIC mqtt_helper.cc)
# order matters, local lib first # order matters, local lib first
LIST(APPEND COMM_LIBS zmqhelper util fmt zmq) LIST(APPEND COMM_LIBS zmqhelper util fmt zmq)
LIST(APPEND AV_LIBS avformat swscale avcodec avutil swresample) LIST(APPEND AV_LIBS avformat swscale avcodec avutil swresample)
add_executable(evcloudsvc evcloudsvc.cpp) add_executable(evcloudsvc evcloudsvc.cpp)
target_link_libraries(evcloudsvc PUBLIC database leveldb ${COMM_LIBS} ${EXTRA_LIBS}) target_link_libraries(evcloudsvc PUBLIC database leveldb paho-mqtt3a mqtthelper ${COMM_LIBS} ${EXTRA_LIBS})
add_executable(evdaemon evdaemon.cpp) add_executable(evdaemon evdaemon.cpp)
target_link_libraries(evdaemon PUBLIC database leveldb ${COMM_LIBS} ${SSH2LIB} ${EXTRA_LIBS}) target_link_libraries(evdaemon PUBLIC database leveldb ${COMM_LIBS} ${SSH2LIB} ${EXTRA_LIBS})
......
...@@ -143,19 +143,6 @@ evmlmotion/fast: ...@@ -143,19 +143,6 @@ evmlmotion/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/evmlmotion.dir/build.make CMakeFiles/evmlmotion.dir/build $(MAKE) $(MAKESILENT) -f CMakeFiles/evmlmotion.dir/build.make CMakeFiles/evmlmotion.dir/build
.PHONY : evmlmotion/fast .PHONY : evmlmotion/fast
#=============================================================================
# Target rules for targets named evslicer
# Build rule for target.
evslicer: cmake_check_build_system
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 evslicer
.PHONY : evslicer
# fast build rule for target.
evslicer/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/evslicer.dir/build.make CMakeFiles/evslicer.dir/build
.PHONY : evslicer/fast
#============================================================================= #=============================================================================
# Target rules for targets named evpuller # Target rules for targets named evpuller
...@@ -221,6 +208,32 @@ evcloudsvc/fast: ...@@ -221,6 +208,32 @@ evcloudsvc/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/evcloudsvc.dir/build.make CMakeFiles/evcloudsvc.dir/build $(MAKE) $(MAKESILENT) -f CMakeFiles/evcloudsvc.dir/build.make CMakeFiles/evcloudsvc.dir/build
.PHONY : evcloudsvc/fast .PHONY : evcloudsvc/fast
#=============================================================================
# Target rules for targets named evslicer
# Build rule for target.
evslicer: cmake_check_build_system
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 evslicer
.PHONY : evslicer
# fast build rule for target.
evslicer/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/evslicer.dir/build.make CMakeFiles/evslicer.dir/build
.PHONY : evslicer/fast
#=============================================================================
# Target rules for targets named mqtthelper
# Build rule for target.
mqtthelper: cmake_check_build_system
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 mqtthelper
.PHONY : mqtthelper
# fast build rule for target.
mqtthelper/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mqtthelper.dir/build.make CMakeFiles/mqtthelper.dir/build
.PHONY : mqtthelper/fast
#============================================================================= #=============================================================================
# Target rules for targets named zmqhelper # Target rules for targets named zmqhelper
...@@ -623,6 +636,33 @@ inc/zmqhelper.cpp.s: ...@@ -623,6 +636,33 @@ inc/zmqhelper.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/zmqhelper.dir/build.make CMakeFiles/zmqhelper.dir/inc/zmqhelper.cpp.s $(MAKE) $(MAKESILENT) -f CMakeFiles/zmqhelper.dir/build.make CMakeFiles/zmqhelper.dir/inc/zmqhelper.cpp.s
.PHONY : inc/zmqhelper.cpp.s .PHONY : inc/zmqhelper.cpp.s
mqtt_helper.o: mqtt_helper.cc.o
.PHONY : mqtt_helper.o
# target to build an object file
mqtt_helper.cc.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mqtthelper.dir/build.make CMakeFiles/mqtthelper.dir/mqtt_helper.cc.o
.PHONY : mqtt_helper.cc.o
mqtt_helper.i: mqtt_helper.cc.i
.PHONY : mqtt_helper.i
# target to preprocess a source file
mqtt_helper.cc.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mqtthelper.dir/build.make CMakeFiles/mqtthelper.dir/mqtt_helper.cc.i
.PHONY : mqtt_helper.cc.i
mqtt_helper.s: mqtt_helper.cc.s
.PHONY : mqtt_helper.s
# target to generate assembly for a file
mqtt_helper.cc.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mqtthelper.dir/build.make CMakeFiles/mqtthelper.dir/mqtt_helper.cc.s
.PHONY : mqtt_helper.cc.s
postfile.o: postfile.cpp.o postfile.o: postfile.cpp.o
.PHONY : postfile.o .PHONY : postfile.o
...@@ -668,6 +708,7 @@ help: ...@@ -668,6 +708,7 @@ help:
@echo "... evpusher" @echo "... evpusher"
@echo "... evslicer" @echo "... evslicer"
@echo "... evwifi" @echo "... evwifi"
@echo "... mqtthelper"
@echo "... post" @echo "... post"
@echo "... util" @echo "... util"
@echo "... zmqhelper" @echo "... zmqhelper"
...@@ -707,6 +748,9 @@ help: ...@@ -707,6 +748,9 @@ help:
@echo "... inc/zmqhelper.o" @echo "... inc/zmqhelper.o"
@echo "... inc/zmqhelper.i" @echo "... inc/zmqhelper.i"
@echo "... inc/zmqhelper.s" @echo "... inc/zmqhelper.s"
@echo "... mqtt_helper.o"
@echo "... mqtt_helper.i"
@echo "... mqtt_helper.s"
@echo "... postfile.o" @echo "... postfile.o"
@echo "... postfile.i" @echo "... postfile.i"
@echo "... postfile.s" @echo "... postfile.s"
......
...@@ -19,6 +19,7 @@ update: 2019/09/10 ...@@ -19,6 +19,7 @@ update: 2019/09/10
#include "utils.hpp" #include "utils.hpp"
#include "inc/zmqhelper.hpp" #include "inc/zmqhelper.hpp"
#include "fmt/format.h" #include "fmt/format.h"
#include "mqtt_helper.hpp"
using namespace std; using namespace std;
using namespace httplib; using namespace httplib;
...@@ -31,7 +32,6 @@ using namespace zmqhelper; ...@@ -31,7 +32,6 @@ using namespace zmqhelper;
#define NUM_MAX_REPORT_HISTORY 5 #define NUM_MAX_REPORT_HISTORY 5
class EvCloudSvc { class EvCloudSvc {
private: private:
Server svr; Server svr;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
mqtt_helper.hpp
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论