more consistent directory structure

Signed-off-by: aw <[email protected]>
EVerest · Oct 22, 2024 · 13dfb52 · 13dfb52
1 parent 22a59e8
commit 13dfb52
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 8 deletions.
diff --git a/lib/staging/tls/extensions/tls_types.hpp b/lib/staging/tls/extensions/tls_types.hpp
@@ -6,7 +6,7 @@
 
 #include <cstdint>
 
-#include <everest/staging/EnumFlags.hpp>
+#include <everest/staging/util/EnumFlags.hpp>
 
 struct ocsp_response_st;
 struct ssl_ctx_st;

diff --git a/lib/staging/tls/tests/tls_connection_test.hpp b/lib/staging/tls/tests/tls_connection_test.hpp
@@ -17,7 +17,7 @@
 #include <tls.hpp>
 #include <unistd.h>
 
-#include <everest/staging/EnumFlags.hpp>
+#include <everest/staging/util/EnumFlags.hpp>
 
 using namespace std::chrono_literals;
 

diff --git a/lib/staging/util/BUILD.bazel b/lib/staging/util/BUILD.bazel
@@ -1,6 +1,6 @@
 cc_library(
     name = "util",
-    hdrs = ["include/everest/staging/EnumFlags.hpp"],
+    hdrs = ["include/*.hpp"],
     visibility = ["//visibility:public"],
     includes = ["include"],
 )
diff --git a/...til/include/everest/staging/EnumFlags.hpp → ...nclude/everest/staging/util/EnumFlags.hpp b/...til/include/everest/staging/EnumFlags.hpp → ...nclude/everest/staging/util/EnumFlags.hpp
diff --git a/lib/staging/util/tests/EnumFlagsTest.cpp b/lib/staging/util/tests/EnumFlagsTest.cpp
@@ -2,9 +2,7 @@
 // Copyright Pionix GmbH and Contributors to EVerest
 #include <gtest/gtest.h>
 
-#include <everest/staging/EnumFlags.hpp>
-
-#include <atomic>
+#include <everest/staging/util/EnumFlags.hpp>
 
 enum class ErrorHandlingFlags : std::uint8_t {
     prevent_charging,

diff --git a/modules/EvseManager/BUILD.bazel b/modules/EvseManager/BUILD.bazel
@@ -12,7 +12,6 @@ cc_everest_module(
     deps = [
         "@pugixml//:libpugixml",
         "@sigslot//:sigslot",
-        "@everest-core//lib/staging/util:util"
     ],
     impls = IMPLS,
     srcs = glob(

diff --git a/modules/EvseManager/CMakeLists.txt b/modules/EvseManager/CMakeLists.txt
@@ -25,7 +25,6 @@ target_link_libraries(${MODULE_NAME}
     PRIVATE
         Pal::Sigslot
         pugixml::pugixml
-        everest::staging::util
 )
 
 if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)