From: gichan Date: Thu, 21 Jul 2022 08:34:51 +0000 (+0900) Subject: [Debian] Use paho-mqtt w/o pkgconfing X-Git-Tag: submit/tizen/20220810.074948~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74df1f2c96fc2078fac7fdfb90f2a4033a335849;p=platform%2Fupstream%2Fnnstreamer-edge.git [Debian] Use paho-mqtt w/o pkgconfing - Use paho-mqtt without pkgcong. Signed-off-by: gichan --- diff --git a/CMakeLists.txt b/CMakeLists.txt index dada8e8..ae8891e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ SET(NNS_EDGE_SRC_DIR ${SOURCE_DIR}/libnnstreamer-edge) # Check requires packages # TODO FIXME remove glib dependency -SET(REQUIRES_LIST "paho-mqtt-c glib-2.0 gio-2.0") +SET(REQUIRES_LIST "glib-2.0 gio-2.0") INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(EDGE_REQUIRE_PKGS REQUIRED ${REQUIRES_LIST}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cfdb5dd..d02a6ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,5 +11,13 @@ SET_TARGET_PROPERTIES(${NNS_EDGE_LIB_NAME} PROPERTIES VERSION ${SO_VERSION}) TARGET_INCLUDE_DIRECTORIES(${NNS_EDGE_LIB_NAME} PRIVATE ${INCLUDE_DIR} ${EDGE_REQUIRE_PKGS_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES(${NNS_EDGE_LIB_NAME} ${EDGE_REQUIRE_PKGS_LDFLAGS}) +PKG_SEARCH_MODULE (PAHO_MQTT_PKG "paho-mqtt-c") +IF (PAHO_MQTT_PKG_MODULE_NAME) + TARGET_LINK_LIBRARIES(${NNS_EDGE_LIB_NAME} ${PAHO_MQTT_PKG_LDFLAGS}) +ELSE() + MESSAGE (WARNING "paho-mqtt-c pkgcong is not found. Hardcoded build configuration is used.") + TARGET_LINK_LIBRARIES(${NNS_EDGE_LIB_NAME} paho-mqtt3a paho-mqtt3c paho-mqtt3as paho-mqtt3cs) +ENDIF() + INSTALL (TARGETS ${NNS_EDGE_LIB_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL (FILES ${INCLUDE_DIR}/nnstreamer-edge.h DESTINATION ${INCLUDE_INSTALL_DIR})