Fetch sdbus-c++ in EDM mode

Signed-off-by: Kai-Uwe Hermann <[email protected]>

Author: hikinggrass

.ci/build-kit/docker/Dockerfile

@@ -10,9 +10,3 @@ FROM ghcr.io/everest/everest-ci/build-kit-base:${BASE_IMAGE_TAG}
 #     && cd ${EVEREST_CMAKE_PATH} \
 #     && git checkout ${EVEREST_CMAKE_VERSION} \
 #     && rm -r .git
-
-# FIXME(kai): Install sdbus-c++ v2.1.0 from source until CI is updated to debian 13
-RUN apt-get update && apt-get -y install libsystemd-dev
-RUN git clone https://github.com/Kistler-Group/sdbus-cpp.git -b v2.1.0
-RUN cmake -S sdbus-cpp -B sdbus-cpp-build -DCMAKE_BUILD_TYPE=Release
-RUN cmake --build sdbus-cpp-build --target install

CMakeLists.txt

@@ -97,6 +97,10 @@ if(NOT DISABLE_EDM)
 
     # FIXME (aw): we need to set this by hand due to edm
     set(EVEREST_SCHEMA_DIR ${everest-framework_SOURCE_DIR}/schemas)
+
+    if(NOT TARGET SDBusCpp::sdbus-c++)
+        add_library(SDBusCpp::sdbus-c++ ALIAS sdbus-c++)
+    endif()
 else()
     find_package(everest-framework REQUIRED)
     find_package(everest-ocpp REQUIRED)
@@ -115,6 +119,8 @@ else()
     find_package(nlohmann_json REQUIRED)
 
     find_package(ftxui 5 QUIET) # optional, if not available BringUp module will not be built
+
+    find_package(sdbus-c++ REQUIRED)
 endif()
 
 

dependencies.yaml

@@ -105,6 +105,11 @@ mqttc:
   git: https://github.com/LiamBindle/MQTT-C.git
   git_tag: v1.1.6
   options: ["MQTT_C_EXAMPLES OFF", "CMAKE_POSITION_INDEPENDENT_CODE ON"]
+# Linux_Systemd_Rauc module
+sdbus-cpp:
+  git:  https://github.com/Kistler-Group/sdbus-cpp.git
+  git_tag: v2.1.0
+  cmake_condition: "EVEREST_DEPENDENCY_ENABLED_SDBUS_CPP"
 # unit testing
 gtest:
   # GoogleTest now follows the Abseil Live at Head philosophy. We recommend updating to the latest commit in the main branch as often as possible.

lib/everest/system/CMakeLists.txt

@@ -1,5 +1,7 @@
-
-find_package(sdbus-c++ REQUIRED)
+if(NOT DEFINED sdbus-c++_VERSION_MAJOR AND NOT DISABLE_EDM)
+    string(REPLACE "." ";" SDBUS_CPP_VERSION_SPLIT ${CPM_PACKAGE_sdbus-cpp_VERSION})
+    list(GET SDBUS_CPP_VERSION_SPLIT 0 sdbus-c++_VERSION_MAJOR)
+endif()
 message("Found sdbus-c++ major version: " ${sdbus-c++_VERSION_MAJOR})
 
 add_library(everest_system STATIC)

module-dependencies.cmake

@@ -62,6 +62,11 @@ ev_define_dependency(
     DEPENDENCY_NAME ftxui
     DEPENDENT_MODULES_LIST BUDisplayMessage BUEvseBoardSupport BUIsolationMonitor BUmMWcar BUNfcReader BUOverVoltageMonitor BUPowermeter BUPowerSupplyDC BUSystem)
 
+ev_define_dependency(
+    DEPENDENCY_NAME sdbus-cpp
+    OUTPUT_VARIABLE_SUFFIX SDBUS_CPP
+    DEPENDENT_MODULES_LIST Linux_Systemd_Rauc)
+
 if(NOT everest-gpio IN_LIST EVEREST_EXCLUDE_DEPENDENCIES)
     set(EVEREST_DEPENDENCY_ENABLED_EVEREST_GPIO ON)
 else()