From 6985d92f6f63e79403955abf2980425bc8c21678 Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Wed, 21 Jun 2023 15:36:10 +0200 Subject: [PATCH] node-amqp: Handle moved include dir of rabbitmq-c Signed-off-by: Philipp Jungkamp --- CMakeLists.txt | 6 ++++++ include/villas/node/config.hpp.in | 1 + include/villas/nodes/amqp.hpp | 6 ++++++ lib/nodes/amqp.cpp | 7 +++++++ 4 files changed, 20 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83f69fedb..e9a0f1062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,6 +145,12 @@ if (REDISPP_FOUND) endif() endif() +if (RABBITMQ_C_FOUND) + if (EXISTS "${RABBITMQ_C_INCLUDEDIR}/rabbitmq-c/amqp.h") + set(RABBITMQ_C_NEW_INCLUDE_DIR ON) + endif() +endif() + # Check if libwebsockets is build with deflate extension if(${CMAKE_VERSION} VERSION_LESS "3.12.4") set(LWS_LOCATION "${LIBWEBSOCKETS_LIBRARY_DIRS}/lib${LIBWEBSOCKETS_LIBRARIES}.so") diff --git a/include/villas/node/config.hpp.in b/include/villas/node/config.hpp.in index 16281314f..7bad18763 100644 --- a/include/villas/node/config.hpp.in +++ b/include/villas/node/config.hpp.in @@ -59,3 +59,4 @@ #cmakedefine LWS_DEFLATE_FOUND #cmakedefine REDISPP_WITH_TLS #cmakedefine REDISPP_WITH_URI +#cmakedefine RABBITMQ_C_NEW_INCLUDE_DIR diff --git a/include/villas/nodes/amqp.hpp b/include/villas/nodes/amqp.hpp index 8c24c4580..8ea42a03d 100644 --- a/include/villas/nodes/amqp.hpp +++ b/include/villas/nodes/amqp.hpp @@ -8,7 +8,13 @@ #pragma once +#include + +#ifdef RABBITMQ_C_NEW_INCLUDE_DIR +#include +#else #include +#endif #include #include diff --git a/lib/nodes/amqp.cpp b/lib/nodes/amqp.cpp index 6d6201325..87aa35d2e 100644 --- a/lib/nodes/amqp.cpp +++ b/lib/nodes/amqp.cpp @@ -7,8 +7,15 @@ #include +#include + +#ifdef RABBITMQ_C_NEW_INCLUDE_DIR +#include +#include +#else #include #include +#endif #include #include