From 50a3a765d2cc12da5b4b98b6274077be478c2b32 Mon Sep 17 00:00:00 2001 From: medina5 Date: Sun, 7 Dec 2025 20:40:40 +0100 Subject: [PATCH] Lib prometheus et paho.mqtt --- .devcontainer/Dockerfile | 15 +++++++++++++-- CMakeLists.txt | 4 +++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5a21f97..943e5ee 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -15,14 +15,25 @@ RUN set -eux; \ libmicrohttpd-dev \ libcurl4-openssl-dev \ zlib1g-dev \ - prometheus-cpp-dev + prometheus-cpp-dev \ + nlohmann-json3-dev RUN set -eux; \ apt-get update; \ apt-get install -y \ libpaho-mqtt-dev - RUN set -eux; \ +RUN set -eux; \ + git clone https://github.com/eclipse/paho.mqtt.cpp.git; \ + cd paho.mqtt.cpp; \ + git submodule init; \ + git submodule update; \ + mkdir build && cd build; \ + cmake -DPAHO_WITH_MQTT_C=ON ..; \ + cmake --build . --target install; \ + ldconfig; + +RUN set -eux; \ apt-get update; \ apt-get install -y \ librabbitmq4 \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a2b47a..73b9cd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ find_library(NCURSESW_LIB ncursesw REQUIRED) find_library(RABBITMQ_LIB rabbitmq REQUIRED) # Paho MQTT C client +find_library(PAHO_MQTTPP3_LIB paho-mqttpp3 REQUIRED) find_library(PAHO_MQTT3C_LIB paho-mqtt3c REQUIRED) # ------------------------------- @@ -53,5 +54,6 @@ target_link_libraries(geii_exporter ${Z_LIB} ${NCURSESW_LIB} ${RABBITMQ_LIB} - ${PAHO_MQTT3C_LIB} + ${PAHO_MQTT3C_LIB} # dépendance C + ${PAHO_MQTTPP3_LIB} # lib C++ )