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

add uuid as new dependency

Browse source
This commit is contained in:
Steffen Vogel 2020-08-25 20:08:29 +02:00
parent 9dd5f200f4
commit 8b2baf1311
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/CMakeLists.txt
View file

@ -61,6 +61,7 @@ find_package(Criterion)
pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.7)
pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.23)
add_subdirectory(lib)
if(CRITERION_FOUND AND TOPLEVEL_PROJECT)

1
common/Dockerfile
View file

@ -53,6 +53,7 @@ RUN dnf -y install \
jansson-devel \
libcurl-devel \
libconfig-devel \
libuuid-devel \
spdlog-devel \
fmt-devel \
openssl-devel openssl

1
common/lib/CMakeLists.txt
View file

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

4
common/tests/unit/list.cpp
View file

@ -33,7 +33,7 @@ using namespace villas;
static const char *nouns[] = { "time", "person", "year", "way", "day", "thing", "man", "world", "life", "hand", "part", "child", "eye", "woman", "place", "work", "week", "case", "point", "government", "company", "number", "group", "problem", "fact" };
struct data {
const char *tag;
const char *name;
int data;
};
@ -50,7 +50,7 @@ Test(list, vlist_lookup_name)
if (!d)
throw MemoryAllocationError();
d->tag = nouns[i];
d->name = nouns[i];
d->data = i;
vlist_push(&l, d);