From f4f2849da8e7340d775ba4d28e58b0606b5aa562 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 5 Apr 2019 03:35:50 +0200 Subject: [PATCH] reduce version requirement of libuuid --- CMakeLists.txt | 2 +- src/villas-relay.hpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac162cc60..76e6f85ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ 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(LIBULDAQ IMPORTED_TARGET libuldaq>=1.0.0) -pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.31) +pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.29) pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg) if(NOT NANOMSG_FOUND) pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0) diff --git a/src/villas-relay.hpp b/src/villas-relay.hpp index e28041ce5..cb430e3d4 100644 --- a/src/villas-relay.hpp +++ b/src/villas-relay.hpp @@ -27,6 +27,10 @@ #include #include +#ifdef UUID_STR_LEN + #define UUID_STR_LEN 37 +#endif + #include /* Forward declarations */