diff options
| author | Alexander Kutsan (GitHub) <akutsan@luxoft.com> | 2016-12-28 12:39:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-28 12:39:34 +0200 |
| commit | 7d29edc6716188776d4a5668d7960dc58724f611 (patch) | |
| tree | 782ee7aa390efff299875beb11ae7360413379cb | |
| parent | 05dc77839b259c2531ab6577e497d9d9f6661ed9 (diff) | |
| parent | f164faebab4f15d169c20d31526ab89f7f86eeed (diff) | |
| download | sdl_core-7d29edc6716188776d4a5668d7960dc58724f611.tar.gz | |
Merge pull request #1136 from LitvinenkoIra/fix/remove_mqueue_adapter
Remove MqueueAdapter from CMakeLists and life_cycle
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/appMain/life_cycle.h | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index deddd75cd1..3252f7071d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,9 +114,6 @@ if (HMI_ADAPTER_OPTION) elseif (${HMI_ADAPTER_OPTION} STREQUAL "DBUS") message(STATUS "Jenkins integration: selected HMI adapter DBUS") set (HMIADAPTER "dbus") - elseif (${HMI_ADAPTER_OPTION} STREQUAL "MQUEUE") - message(STATUS "Jenkins integration: selected HMI adapter MQUEUE") - set (HMIADAPTER "mqueue") endif() endif() @@ -403,9 +400,6 @@ endif() if (HMI STREQUAL "web" AND NOT DEFINED HMIADAPTER) set(HMIADAPTER "messagebroker") endif() -if (HMI STREQUAL "no" AND NOT DEFINED HMIADAPTER) - set(HMIADAPTER "mqueue") -endif() if (HMIADAPTER STREQUAL "dbus") set(HMI_DBUS_API ON) @@ -418,11 +412,6 @@ if (HMIADAPTER STREQUAL "messagebroker") add_definitions(-DMESSAGEBROKER_HMIADAPTER) add_definitions(-DHMI_JSON_API) endif() -if (HMIADAPTER STREQUAL "mqueue") - set(HMI_JSON_API ON) - add_definitions(-DMQUEUE_HMIADAPTER) - add_definitions(-DHMI_JSON_API) -endif() # --- Directory with SDL interfaces, global types and ProtocolLib component include_directories( diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h index 2d6e0b938e..f1b3800254 100644 --- a/src/appMain/life_cycle.h +++ b/src/appMain/life_cycle.h @@ -43,9 +43,6 @@ #if (defined(MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI)) #include "hmi_message_handler/messagebroker_adapter.h" #endif // #if ( defined (MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI) ) -#ifdef MQUEUE_HMIADAPTER -#include "hmi_message_handler/mqueue_adapter.h" -#endif // MQUEUE_HMIADAPTER #include "application_manager/application_manager_impl.h" #include "connection_handler/connection_handler_impl.h" #include "protocol_handler/protocol_handler_impl.h" |