From dd4b38e725732c0922e6daf471116ab40508e8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piet=20G=C3=B6mpel?=
 <37657534+Pietfried@users.noreply.github.com>
Date: Thu, 16 May 2024 15:33:02 +0200
Subject: [PATCH] Moved conversions of EVerest to/from libevse-security types
 to lib/staging in order to be able to use it also within other modules (#686)

Signed-off-by: pietfried <pietgoempel@gmail.com>
Co-authored-by: Kai Hermann <kai-uwe.hermann@pionix.de>
---
 lib/staging/CMakeLists.txt                    |  1 +
 lib/staging/evse_security/CMakeLists.txt      | 21 +++++++++++++++++++
 .../staging/evse_security}/conversions.cpp    |  2 +-
 .../staging/evse_security}/conversions.hpp    |  0
 modules/EvseSecurity/CMakeLists.txt           |  2 +-
 .../EvseSecurity/main/evse_securityImpl.cpp   |  2 +-
 6 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 lib/staging/evse_security/CMakeLists.txt
 rename {modules/EvseSecurity => lib/staging/evse_security}/conversions.cpp (99%)
 rename {modules/EvseSecurity => lib/staging/evse_security}/conversions.hpp (100%)

diff --git a/lib/staging/CMakeLists.txt b/lib/staging/CMakeLists.txt
index b2cb93665..f186caf24 100644
--- a/lib/staging/CMakeLists.txt
+++ b/lib/staging/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(can_dpm1000)
+add_subdirectory(evse_security)
 if(EVEREST_DEPENDENCY_ENABLED_LIBSLAC AND EVEREST_DEPENDENCY_ENABLED_LIBFSM)
     add_subdirectory(slac)
 endif()
diff --git a/lib/staging/evse_security/CMakeLists.txt b/lib/staging/evse_security/CMakeLists.txt
new file mode 100644
index 000000000..1d722f471
--- /dev/null
+++ b/lib/staging/evse_security/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_library(evse_security_conversions STATIC)
+add_library(everest::evse_security_conversions ALIAS evse_security_conversions)
+
+target_sources(evse_security_conversions
+    PRIVATE
+        conversions.cpp
+)
+
+target_include_directories(evse_security_conversions
+    PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    "$<TARGET_PROPERTY:generate_cpp_files,EVEREST_GENERATED_INCLUDE_DIR>"
+)
+
+add_dependencies(evse_security_conversions generate_cpp_files)
+
+target_link_libraries(evse_security_conversions
+    PRIVATE
+        everest::evse_security
+        everest::framework
+)
diff --git a/modules/EvseSecurity/conversions.cpp b/lib/staging/evse_security/conversions.cpp
similarity index 99%
rename from modules/EvseSecurity/conversions.cpp
rename to lib/staging/evse_security/conversions.cpp
index e9965fe49..216c48807 100644
--- a/modules/EvseSecurity/conversions.cpp
+++ b/lib/staging/evse_security/conversions.cpp
@@ -3,7 +3,7 @@
 
 #include <exception>
 
-#include <conversions.hpp>
+#include <evse_security/conversions.hpp>
 
 namespace module {
 
diff --git a/modules/EvseSecurity/conversions.hpp b/lib/staging/evse_security/conversions.hpp
similarity index 100%
rename from modules/EvseSecurity/conversions.hpp
rename to lib/staging/evse_security/conversions.hpp
diff --git a/modules/EvseSecurity/CMakeLists.txt b/modules/EvseSecurity/CMakeLists.txt
index 176307daa..aa962192d 100644
--- a/modules/EvseSecurity/CMakeLists.txt
+++ b/modules/EvseSecurity/CMakeLists.txt
@@ -13,13 +13,13 @@ ev_setup_cpp_module()
 target_link_libraries(${MODULE_NAME}
     PRIVATE
         everest::evse_security
+        everest::evse_security_conversions
 )
 # ev@bcc62523-e22b-41d7-ba2f-825b493a3c97:v1
 
 target_sources(${MODULE_NAME}
     PRIVATE
         "main/evse_securityImpl.cpp"
-        "conversions.cpp"
 )
 
 # ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1
diff --git a/modules/EvseSecurity/main/evse_securityImpl.cpp b/modules/EvseSecurity/main/evse_securityImpl.cpp
index d53df42c1..f3269d7a4 100644
--- a/modules/EvseSecurity/main/evse_securityImpl.cpp
+++ b/modules/EvseSecurity/main/evse_securityImpl.cpp
@@ -2,7 +2,7 @@
 // Copyright Pionix GmbH and Contributors to EVerest
 
 #include "evse_securityImpl.hpp"
-#include "../conversions.hpp"
+#include <evse_security/conversions.hpp>
 
 namespace module {
 namespace main {