From 2bfa54e013573882480942c4704f8d5a472e32b4 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Mon, 7 Aug 2023 20:10:34 +0900 Subject: [PATCH] move CustomMQ to modules - for supporting RT without changing source code --- CMakeLists.txt | 4 +++- {src => modules/custom_mqtt}/CustomMQ.cc | 0 {src => modules/custom_mqtt}/CustomMQ.h | 0 src/ModuleManager_RT.cc | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) rename {src => modules/custom_mqtt}/CustomMQ.cc (100%) rename {src => modules/custom_mqtt}/CustomMQ.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41f814a..314f778 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,9 @@ add_library(${PROJECT_NAME} SHARED ${AITT_SRC} $) target_link_libraries(${PROJECT_NAME} Threads::Threads ${CMAKE_DL_LIBS} ${AITT_COMMON}) target_link_libraries(${PROJECT_NAME} ${AITT_NEEDS_LIBRARIES}) if(PLATFORM STREQUAL "tizenRT") - target_link_libraries(${PROJECT_NAME} ${AITT_TCP}) + target_include_directories(${PROJECT_NAME} PRIVATE modules/custom_mqtt) + add_library(CUSTOM_MQ STATIC modules/custom_mqtt/CustomMQ.cc) + target_link_libraries(${PROJECT_NAME} ${AITT_TCP} CUSTOM_MQ) endif(PLATFORM STREQUAL "tizenRT") target_compile_options(${PROJECT_NAME} PUBLIC ${AITT_NEEDS_CFLAGS_OTHER}) diff --git a/src/CustomMQ.cc b/modules/custom_mqtt/CustomMQ.cc similarity index 100% rename from src/CustomMQ.cc rename to modules/custom_mqtt/CustomMQ.cc diff --git a/src/CustomMQ.h b/modules/custom_mqtt/CustomMQ.h similarity index 100% rename from src/CustomMQ.h rename to modules/custom_mqtt/CustomMQ.h diff --git a/src/ModuleManager_RT.cc b/src/ModuleManager_RT.cc index b5f584d..738b0e1 100644 --- a/src/ModuleManager_RT.cc +++ b/src/ModuleManager_RT.cc @@ -64,7 +64,7 @@ std::unique_ptr ModuleManager::NewCustomMQ(const std::string &id, const Aitt { std::unique_ptr instance(new CustomMQ(id, option)); if (instance == nullptr) { - ERR("STBrokerMQ() Fail"); + ERR("CustomMQ() Fail"); throw AittException(AittException::SYSTEM_ERR); } -- 2.7.4