This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new e17c9aa MINIFICPP-717: Make MQTT link statically. Also resolve issue
with controller
e17c9aa is described below
commit e17c9aa6f0a2e89befcf47394a156a839664d9e9
Author: Marc Parisi <[email protected]>
AuthorDate: Tue Jan 22 12:33:55 2019 -0500
MINIFICPP-717: Make MQTT link statically. Also resolve issue with controller
This closes #474.
Signed off on GH by jdye64.
Signed-off-by: Marc Parisi <[email protected]>
---
controller/Controller.h | 1 +
extensions/mqtt/CMakeLists.txt | 12 ++++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/controller/Controller.h b/controller/Controller.h
index bbd099b..b1fdb5a 100644
--- a/controller/Controller.h
+++ b/controller/Controller.h
@@ -317,6 +317,7 @@ void printManifest(const std::shared_ptr<minifi::Configure>
&configuration) {
configuration->set("c2.agent.heartbeat.period", "25");
configuration->set("nifi.c2.root.classes", "AgentInformation");
configuration->set("nifi.c2.enable", "true");
+ configuration->set("nifi.c2.agent.class","test");
configuration->set("c2.agent.listen", "true");
configuration->set("c2.agent.heartbeat.reporter.classes", "AgentPrinter");
diff --git a/extensions/mqtt/CMakeLists.txt b/extensions/mqtt/CMakeLists.txt
index e86e016..75e23c1 100644
--- a/extensions/mqtt/CMakeLists.txt
+++ b/extensions/mqtt/CMakeLists.txt
@@ -24,6 +24,9 @@ include_directories(../../thirdparty/paho.mqtt.c/src)
file(GLOB SOURCES "*.cpp" "protocol/*.cpp" "processors/*.cpp"
"controllerservice/*.cpp")
+
+set(PAHO_BUILD_STATIC "ON" CACHE STRING "" FORCE)
+
add_library(minifi-mqtt-extensions STATIC ${SOURCES})
set_property(TARGET minifi-mqtt-extensions PROPERTY POSITION_INDEPENDENT_CODE
ON)
if(THREADS_HAVE_PTHREAD_ARG)
@@ -34,15 +37,16 @@ if(CMAKE_THREAD_LIBS_INIT)
endif()
+
# Include UUID
target_link_libraries(minifi-mqtt-extensions ${CMAKE_DL_LIBS} )
if (MQTT_FOUND AND NOT BUILD_MQTT)
target_link_libraries(minifi-mqtt-extensions ${MQTT_LIBRARIES} )
else()
- target_link_libraries(minifi-mqtt-extensions paho-mqtt3a )
- target_link_libraries(minifi-mqtt-extensions paho-mqtt3c )
- target_link_libraries(minifi-mqtt-extensions paho-mqtt3as )
- target_link_libraries(minifi-mqtt-extensions paho-mqtt3cs )
+ target_link_libraries(minifi-mqtt-extensions paho-mqtt3a-static )
+ target_link_libraries(minifi-mqtt-extensions paho-mqtt3c-static )
+ target_link_libraries(minifi-mqtt-extensions paho-mqtt3as-static )
+ target_link_libraries(minifi-mqtt-extensions paho-mqtt3cs-static )
endif()
find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS})
