[MQTT] Change mqtt lib priority

Change mosquitto lib to have a higher priority than paho-mqtt-c lib.

Signed-off-by: gichan <gichan2.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 679fd27c25930f360d94c49cf2df6e0e1956185c..ebd5a18ce3275fdca7f230994f29a49225d1e800 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,23 +42,23 @@ SET(INCLUDE_DIR   ${CMAKE_CURRENT_SOURCE_DIR}/include)
 SET(NNS_EDGE_SRC_DIR  ${SOURCE_DIR}/libnnstreamer-edge)
 
 IF(MQTT_SUPPORT)
-    PKG_SEARCH_MODULE(PAHO_MQTT_PKG "paho-mqtt-c")
-    IF(PAHO_MQTT_PKG_FOUND)
-        MESSAGE("Found Paho MQTT pkgconfig.")
-        SET(PAHO_MQTT_LIB ${PAHO_MQTT_PKG_LDFLAGS})
-    ELSE()
-        FIND_LIBRARY(PAHO_MQTT_LIB NAMES paho-mqtt3a paho-mqtt3c paho-mqtt3as paho-mqtt3cs)
+    FIND_LIBRARY(MOSQUITTO_LIB NAMES mosquitto)
+    IF(NOT MOSQUITTO_LIB)
+        PKG_SEARCH_MODULE(PAHO_MQTT_PKG "paho-mqtt-c")
+        IF(PAHO_MQTT_PKG_FOUND)
+            MESSAGE("Found Paho MQTT pkgconfig.")
+            SET(PAHO_MQTT_LIB ${PAHO_MQTT_PKG_LDFLAGS})
+        ELSE()
+            FIND_LIBRARY(PAHO_MQTT_LIB NAMES paho-mqtt3a paho-mqtt3c paho-mqtt3as paho-mqtt3cs)
 
-        IF(NOT PAHO_MQTT_LIB)
-            FIND_LIBRARY(MOSQUITTO_LIB NAMES mosquitto)
-            IF(NOT MOSQUITTO_LIB)
+            IF(NOT PAHO_MQTT_LIB)
                 MESSAGE("FATAL_ERROR Cannot find paho-mqtt-c and mosquitto library.")
             ELSE()
-                MESSAGE("FOUND MOSQUITTO LIB.")
+                MESSAGE("Found Paho MQTT library.")
             ENDIF()
-        ELSE()
-            MESSAGE("Found Paho MQTT library.")
         ENDIF()
+    ELSE()
+        MESSAGE("FOUND MOSQUITTO LIB.")
     ENDIF()
 
     SET(NNS_EDGE_FLAGS "${NNS_EDGE_FLAGS} -DENABLE_MQTT=1")

diff --git a/debian/control b/debian/control
index e60765a917811df83da795918f281270476dc8d4..868b583ec0c5b11d7a8e91919b8199e9ce27aa96 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: MyungJoo Ham <myungjoo.ham@samsung.com>
 Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4),
- debhelper (>=9), cmake, libpaho-mqtt-dev,
+ debhelper (>=9), cmake, libmosquitto-dev,
  libgtest-dev
 Standards-Version: 0.0.1
 Homepage: https://github.com/nnstreamer/nnstreamer-edge

diff --git a/packaging/nnstreamer-edge.spec b/packaging/nnstreamer-edge.spec
index a7159f253f78c94396b53ffc39a949b53b953b98..42dfb7bfd168fdd14b21bb38260d2a76ccfd6f1e 100644 (file)
--- a/packaging/nnstreamer-edge.spec
+++ b/packaging/nnstreamer-edge.spec
@@ -33,7 +33,7 @@ BuildRequires:  pkgconfig(dlog)
 %endif
 
 %if 0%{?mqtt_support}
-BuildRequires:  pkgconfig(paho-mqtt-c)
+BuildRequires:  pkgconfig(libmosquitto)
 %endif
 
 %if 0%{?aitt_support}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae34073afb76f4ca7f06525e3cee0865d5b5c7c6..51427a5944d3d329cbe4cdd69e35afdb929b4a01 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,10 +11,10 @@ SET(NNS_EDGE_SRCS
 )
 
 IF(MQTT_SUPPORT)
-    IF(PAHO_MQTT_LIB)
-        SET(NNS_EDGE_SRCS ${NNS_EDGE_SRCS} ${NNS_EDGE_SRC_DIR}/nnstreamer-edge-mqtt-paho.c)
-    ELSE()
+    IF(MOSQUITTO_LIB)
         SET(NNS_EDGE_SRCS ${NNS_EDGE_SRCS} ${NNS_EDGE_SRC_DIR}/nnstreamer-edge-mqtt-mosquitto.c)
+    ELSE()
+        SET(NNS_EDGE_SRCS ${NNS_EDGE_SRCS} ${NNS_EDGE_SRC_DIR}/nnstreamer-edge-mqtt-paho.c)
     ENDIF()
 ENDIF()