diff options
author | Shobhit Adlakha <adlakhashobhit@gmail.com> | 2019-04-25 10:29:49 -0400 |
---|---|---|
committer | Shobhit Adlakha <adlakhashobhit@gmail.com> | 2019-04-25 10:29:49 -0400 |
commit | 55599d38ff290088623b6a2099ba2d584c4997da (patch) | |
tree | eba3f79cb5fa68cf717de458c3d967f7361fdfb5 | |
parent | 5b3ac1e52ffc8f89bb14955573ccde8f87427027 (diff) | |
download | sdl_core-55599d38ff290088623b6a2099ba2d584c4997da.tar.gz |
Fixed regex error when building with CLOUD_APP_SUPPORT=OFF
4 files changed, 16 insertions, 5 deletions
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 3d17da51ce..928f31d4f3 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -1185,6 +1185,9 @@ const std::string& ApplicationImpl::cloud_app_certificate() const { } bool ApplicationImpl::is_cloud_app() const { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + return false; +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT return !endpoint_.empty(); } diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt index f1edb6e298..11986ee9fa 100644 --- a/src/components/transport_manager/CMakeLists.txt +++ b/src/components/transport_manager/CMakeLists.txt @@ -76,17 +76,22 @@ endif() if(BUILD_CLOUD_APP_SUPPORT) GET_PROPERTY(BOOST_LIBS_DIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS) list(APPEND LIBRARIES boost_system boost_regex -L${BOOST_LIBS_DIRECTORY}) +else() + list(APPEND EXCLUDE_PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/cloud + ${CMAKE_CURRENT_SOURCE_DIR}/src/cloud + ) endif() if(BUILD_USB_SUPPORT) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(EXCLUDE_PATHS + list(APPEND EXCLUDE_PATHS ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb/qnx ${COMPONENTS_DIR}/transport_manager/src/usb/qnx ) elseif(CMAKE_SYSTEM_NAME STREQUAL "QNX") - set(EXCLUDE_PATHS + list(APPEND EXCLUDE_PATHS ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb/libusb ${COMPONENTS_DIR}/transport_manager/src/usb/libusb ) diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc index 41487b054b..71fc41ada9 100644 --- a/src/components/transport_manager/src/transport_manager_default.cc +++ b/src/components/transport_manager/src/transport_manager_default.cc @@ -46,7 +46,7 @@ #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) #include "transport_manager/cloud/cloud_websocket_transport_adapter.h" -#endif +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT #if defined(BUILD_TESTS) #include "transport_manager/iap2_emulation/iap2_transport_adapter.h" @@ -105,7 +105,7 @@ int TransportManagerDefault::Init(resumption::LastState& last_state) { ta_usb = NULL; #endif // USB_SUPPORT -#if defined CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT +#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) transport_adapter::TransportAdapterImpl* ta_cloud = new transport_adapter::CloudWebsocketTransportAdapter(last_state, get_settings()); @@ -116,7 +116,7 @@ int TransportManagerDefault::Init(resumption::LastState& last_state) { #endif // TELEMETRY_MONITOR AddTransportAdapter(ta_cloud); ta_cloud = NULL; -#endif +#endif // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT #if defined BUILD_TESTS const uint16_t iap2_bt_emu_port = 23456; diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index 2d93b898b4..90969a132b 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -133,6 +133,9 @@ void TransportManagerImpl::ReconnectionTimeout() { void TransportManagerImpl::AddCloudDevice( const transport_manager::transport_adapter::CloudAppProperties& cloud_properties) { +#if !defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT) + return; +#endif transport_adapter::DeviceType type = transport_adapter::DeviceType::UNKNOWN; if (cloud_properties.cloud_transport_type == "WS") { type = transport_adapter::DeviceType::CLOUD_WEBSOCKET; |