summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-10-07 17:09:42 -0400
committerScott Murray <scott.murray@konsulko.com>2019-10-15 11:37:01 -0400
commitf3013d12ea27aa5849ec8da5aed1e3eebfa1b845 (patch)
treef8b972f36130c0530aec9ca86f54be8ec5757c4e /src
parent3caa0589a467a836cc99cd22978d5b7178de2b63 (diff)
Switch to afb-helpers library
Remove old afb-helpers submodule usage in favor of library from the toolchain. Note that json.hpp is no longer shipped with the library, and is now assumed to be present in the toolchain, which requires a DEPENDS addition in the recipe to pick it up. Bug-AGL: SPEC-2855 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ieefd3be424ed9e866debc5e73c9b0995c9cdc31c (cherry picked from commit d8ddb879b61b956d0a7ebd6a181595c9a41a9562)
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/plugins/CMakeLists.txt4
-rw-r--r--src/plugins/VshlCapabilitiesApi.cpp5
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
+}