Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-23 00:00:01 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git.rwth-aachen.de:acs/public/villas/VILLASnode into develop

Browse source
This commit is contained in:
Dennis Potter 2018-10-25 02:45:11 +02:00
commit 822bd33283
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -104,7 +104,7 @@ pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
pkg_check_modules(RABBITMQ_C IMPORTED_TARGET librabbitmq>=0.8.0)
pkg_check_modules(COMEDILIB IMPORTED_TARGET comedilib>=0.11.0)
pkg_check_modules(LIBZMQ IMPORTED_TARGET libzmq>=2.2.0)
pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET libwebsockets>=2.3.0)
pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET REQUIRED libwebsockets>=2.3.0)
pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
if(NOT NANOMSG_FOUND)
pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)

5
include/villas/config_helper.h
View file

@ -23,7 +23,10 @@
#pragma once
#include <jansson.h>
#ifdef LIBCONFIG_FOUND
#include <libconfig.h>
#endif /* LIBCONFIG_FOUND */
#include <villas/sample.h>
@ -31,11 +34,13 @@
extern "C" {
#endif
#ifdef LIBCONFIG_FOUND
/* Convert a libconfig object to a jansson object */
json_t *config_to_json(config_setting_t *cfg);
/* Convert a jansson object into a libconfig object. */
int json_to_config(json_t *json, config_setting_t *parent);
#endif /* LIBCONFIG_FOUND */
/* Create a JSON object from command line parameters. */
json_t *json_load_cli(int argc, char *argv[]);

1
lib/hook.c
View file

@ -30,7 +30,6 @@
#include <villas/utils.h>
#include <villas/node.h>
#include <villas/plugin.h>
#include <villas/config_helper.h>
int hook_init(struct hook *h, struct hook_type *vt, struct path *p, struct node *n)
{

1
lib/node.c
View file

@ -28,7 +28,6 @@
#include <villas/node.h>
#include <villas/utils.h>
#include <villas/plugin.h>
#include <villas/config_helper.h>
#include <villas/mapping.h>
#include <villas/timing.h>
#include <villas/signal.h>

2
lib/nodes/CMakeLists.txt
View file

@ -31,7 +31,7 @@ if(LIBNL3_ROUTE_FOUND)
list(APPEND INCLUDE_DIRS LIBNL3_ROUTE_INCLUDE_DIRS)
endif()
if(WITH_IO)
if(LIBNL3_ROUTE_FOUND AND WITH_IO)
list(APPEND NODE_SRC
test_rtt.c
file.c

1
tools/conf2json.cpp
View file

@ -25,6 +25,7 @@
#include <jansson.h>
#include <libconfig.h>
#include <villas/config.h>
#include <villas/config_helper.h>
#include <villas/utils.h>