Moved conversions of EVerest to/from libevse-security types to lib/st…

…aging in order to be able to use it also within other modules (#686) Signed-off-by: pietfried <[email protected]> Co-authored-by: Kai Hermann <[email protected]>
EVerest · May 16, 2024 · dd4b38e · dd4b38e
1 parent 2c28b84
commit dd4b38e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git 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
@@ -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 → lib/staging/evse_security/conversions.cpp b/modules/EvseSecurity/conversions.cpp → 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 → lib/staging/evse_security/conversions.hpp b/modules/EvseSecurity/conversions.hpp → lib/staging/evse_security/conversions.hpp
diff --git 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
@@ -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 {