diff options
author | JackLivio <jack@livio.io> | 2018-01-21 12:04:31 -0500 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2018-01-21 12:04:31 -0500 |
commit | 08fcc026eafab3d8058d16b353be0995258d82dc (patch) | |
tree | a66516a47140df9f3d4a658a06315d2f790540a4 /src/components | |
parent | ad04121909b2de7d625acd8ec4aff390b39196aa (diff) | |
download | sdl_core-08fcc026eafab3d8058d16b353be0995258d82dc.tar.gz |
Remove Dbus and Iap libraries
Fix compilation error for build dbus and removes the dbus library from the core project. Dbus is still supported but now Core will not install it on the users system.
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/dbus/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/components/dbus/src/dbus_adapter.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/components/dbus/CMakeLists.txt b/src/components/dbus/CMakeLists.txt index f47cef6f75..07ca2586d0 100644 --- a/src/components/dbus/CMakeLists.txt +++ b/src/components/dbus/CMakeLists.txt @@ -40,11 +40,11 @@ include_directories ( ${COMPONENTS_DIR}/utils/include/ ${CMAKE_BINARY_DIR}/src/components/ ) - +message(${CMAKE_CURRENT_SOURCE_DIR}) set(PATHS ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR}/introspection_xml.cc + ${CMAKE_CURRENT_SOURCE_DIR}/src/introspection_xml.cc ${CMAKE_CURRENT_BINARY_DIR}/message_descriptions.cc ) collect_sources(SOURCES "${PATHS}") @@ -74,7 +74,6 @@ add_custom_command( ) add_library("DBus" ${SOURCES}) -add_dependencies("DBus" Utils install-3rd_party_dbus) target_link_libraries("DBus" "${LIBRARIES}") diff --git a/src/components/dbus/src/dbus_adapter.cc b/src/components/dbus/src/dbus_adapter.cc index 7d14eb2de2..a46e8e8167 100644 --- a/src/components/dbus/src/dbus_adapter.cc +++ b/src/components/dbus/src/dbus_adapter.cc @@ -36,8 +36,8 @@ #include "formatters/CSmartFactory.h" #include "utils/logger.h" #include "smart_objects/smart_object.h" -#include "dbus/introspection_xml.cc" -#include "dbus/message_descriptions.cc" +#include "introspection_xml.cc" +#include "message_descriptions.cc" using ford_message_descriptions::ParameterDescription; namespace sos = NsSmartDeviceLink::NsJSONHandler::strings; |