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

add libconfig to dependencies

Browse source
This commit is contained in:
Steffen Vogel 2018-08-23 16:03:34 +02:00
parent a15cccdb38
commit 336fbed4a6
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/CMakeLists.txt
View file

@ -59,6 +59,7 @@ find_package(Criterion)
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.7) pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.7)
pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
add_subdirectory(lib) add_subdirectory(lib)
if(CRITERION_FOUND) if(CRITERION_FOUND)

1
common/Dockerfile
View file

@ -60,6 +60,7 @@ ADD https://villas.fein-aachen.org/packages/villas.repo /etc/yum.repos.d/
RUN dnf -y install \ RUN dnf -y install \
jansson-devel \ jansson-devel \
libcurl-devel \ libcurl-devel \
libconfig-devel \
openssl-devel openssl openssl-devel openssl
# Build & Install Criterion # Build & Install Criterion

8
common/include/villas/compat.h
View file

@ -22,9 +22,10 @@
#pragma once #pragma once
#include <libconfig.h>
#include <jansson.h> #include <jansson.h>
#include <villas/config.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -33,11 +34,12 @@ extern "C" {
size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags); size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
#endif #endif
#if (LIBCONFIG_VER_MAJOR <= 1) && (LIBCONFIG_VER_MINOR < 5) #if defined(LIBCONFIG_FOUND) && (LIBCONFIG_VER_MAJOR <= 1) && (LIBCONFIG_VER_MINOR < 5)
#include <libconfig.h>
#define config_setting_lookup config_lookup_from #define config_setting_lookup config_lookup_from
#endif #endif
#ifdef __MACH__ #ifdef __MACH__
#include <libkern/OSByteOrder.h> #include <libkern/OSByteOrder.h>

1
common/lib/CMakeLists.txt
View file

@ -62,6 +62,7 @@ target_include_directories(villas-common PUBLIC
target_link_libraries(villas-common PUBLIC target_link_libraries(villas-common PUBLIC
PkgConfig::JANSSON PkgConfig::JANSSON
PkgConfig::LIBCONFIG
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}