diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-10-15 17:45:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-10-15 17:45:24 +0000 |
| commit | c1de719af7bdae425f2e42dd3e0642550a8cd6b6 (patch) | |
| tree | 8b57a26175df0b48abd5359a3e38907562ea1b5a /src | |
| parent | 1c529a16578687c4309047e563c8b78dc15c15d0 (diff) | |
| parent | f3013d12ea27aa5849ec8da5aed1e3eebfa1b845 (diff) | |
Merge "Switch to afb-helpers library" into halibut
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/VshlCapabilitiesApi.cpp | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6bc208f..6ca565d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,8 +37,7 @@ PROJECT_TARGET_ADD(vshl-capabilities) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-helpers ctl-utilities ${link_libraries}) -add_subdirectory("plugins")
\ No newline at end of file +add_subdirectory("plugins") diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 705b13d..20c13e9 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -91,7 +91,6 @@ PROJECT_TARGET_ADD(vshl-capabilities-api) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-helpers ${GLIB_PKG_LIBRARIES} ${link_libraries} ) @@ -141,7 +140,6 @@ PROJECT_TARGET_ADD(vshl-capabilities-api) ) TARGET_LINK_LIBRARIES(${TARGET_NAME}_Test - afb-helpers libgtest libgmock ${GLIB_PKG_LIBRARIES} @@ -150,4 +148,4 @@ PROJECT_TARGET_ADD(vshl-capabilities-api) ENABLE_TESTING() ADD_TEST(VshlCapabilitiesTest ${TARGET_NAME}_Test) - endif()
\ No newline at end of file + endif() diff --git a/src/plugins/VshlCapabilitiesApi.cpp b/src/plugins/VshlCapabilitiesApi.cpp index c02fb8f..066edd5 100644 --- a/src/plugins/VshlCapabilitiesApi.cpp +++ b/src/plugins/VshlCapabilitiesApi.cpp @@ -15,6 +15,7 @@ #include "VshlCapabilitiesApi.h" #include <list> +#include <json.hpp> #include "afb/AFBApiImpl.h" #include "afb/AFBRequestImpl.h" @@ -23,8 +24,6 @@ #include "utilities/events/EventRouter.h" #include "utilities/logging/Logger.h" -#include "json.hpp" - using namespace std; CTLP_CAPI_REGISTER("vshlsupport-api"); @@ -408,4 +407,4 @@ CTLP_CAPI(playbackControllerPublish, source, argsJ, eventJ) { AFB_ReqSuccess(source->request, json_object_new_string("Successfully published playbackcontroller messages."), NULL); return 0; -}
\ No newline at end of file +} |