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

config: merge includes recursively

Browse source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel 2022-11-11 06:33:08 -05:00
parent 30b061d8b1
commit 31d6e25c5f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -97,7 +97,7 @@ endif()
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig")
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.9)
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.13)
pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET REQUIRED libwebsockets>=3.1.0)
pkg_check_modules(PROTOBUF IMPORTED_TARGET protobuf>=2.6.0)
pkg_check_modules(PROTOBUFC IMPORTED_TARGET libprotobuf-c>=1.1.0)

2
lib/config.cpp
View file

@ -353,7 +353,7 @@ json_t * Config::expandIncludes(json_t *in)
if (!incl)
incl = other;
else if (json_is_object(incl) && json_is_object(other)) {
ret = json_object_update(incl, other);
ret = json_object_update_recursive(incl, other);
if (ret)
throw ConfigError(str, "Can not mix object and array-typed include files");
}

2
packaging/deps.sh
View file

@ -49,7 +49,7 @@ if ! pkg-config "criterion >= 2.3.1" && \
fi
# Build & Install libjansson
if ! pkg-config "jansson >= 2.7" && \
if ! pkg-config "jansson >= 2.13" && \
[ -z "${SKIP_JANSSON}" ]; then
git clone ${GIT_OPTS} --branch v2.14 https://github.com/akheron/jansson
pushd jansson