From 848122000a3b60fd1528321bde12616f0be34b8a Mon Sep 17 00:00:00 2001
From: yangwei <yangwei@geedgenetworks.com>
Date: Wed, 28 Aug 2024 15:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20build(target=5Finclude=5Fdirecto?=
 =?UTF-8?q?ries):=20rename=20src=20to=20infra?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/core/CMakeLists.txt                             | 2 --
 infra/packet_io/CMakeLists.txt                        | 1 -
 infra/plugin_manager/test/CMakeLists.txt              | 3 ++-
 infra/plugin_manager/test/plugin_manager_gtest_mock.h | 4 ++--
 infra/session_manager/CMakeLists.txt                  | 3 +--
 test/debug_plugin/CMakeLists.txt                      | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/infra/core/CMakeLists.txt b/infra/core/CMakeLists.txt
index 33c9f9d..342a6e0 100644
--- a/infra/core/CMakeLists.txt
+++ b/infra/core/CMakeLists.txt
@@ -9,5 +9,3 @@ target_link_libraries(core PUBLIC ${LIBRARY})
 add_library(stellar_devel SHARED ${SOURCE})
 set_target_properties(stellar_devel PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/version.map")
 target_link_libraries(stellar_devel PRIVATE -Wl,--whole-archive ${LIBRARY} -Wl,--no-whole-archive)
-target_include_directories(stellar_devel PUBLIC ${CMAKE_SOURCE_DIR}/src/utils)
-
diff --git a/infra/packet_io/CMakeLists.txt b/infra/packet_io/CMakeLists.txt
index 8f07fd7..bf4a850 100644
--- a/infra/packet_io/CMakeLists.txt
+++ b/infra/packet_io/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_library(packet_io dumpfile_io.cpp marsio_io.cpp packet_io.cpp)
 target_include_directories(packet_io PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(packet_io PUBLIC ${CMAKE_SOURCE_DIR}/src/stellar)
 target_link_libraries(packet_io marsio pcap packet)
\ No newline at end of file
diff --git a/infra/plugin_manager/test/CMakeLists.txt b/infra/plugin_manager/test/CMakeLists.txt
index 7698640..d16c69a 100644
--- a/infra/plugin_manager/test/CMakeLists.txt
+++ b/infra/plugin_manager/test/CMakeLists.txt
@@ -2,7 +2,8 @@ add_executable(gtest_plugin_manager
 plugin_manager_gtest_main.cpp
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/src/plugin/)
+include_directories(${CMAKE_SOURCE_DIR}/infra/plugin_manager/)
+include_directories(${CMAKE_SOURCE_DIR}/infra/tuple/)
 
 target_link_libraries(
   gtest_plugin_manager
diff --git a/infra/plugin_manager/test/plugin_manager_gtest_mock.h b/infra/plugin_manager/test/plugin_manager_gtest_mock.h
index b25fb63..b398596 100644
--- a/infra/plugin_manager/test/plugin_manager_gtest_mock.h
+++ b/infra/plugin_manager/test/plugin_manager_gtest_mock.h
@@ -5,10 +5,10 @@ extern "C"
 {
 #endif
 
-#include "../plugin_manager_interna.h"
+#include "plugin_manager_interna.h"
 
 #include "stellar/session.h"
-#include "tuple/tuple.h"
+#include "tuple.h"
 
 //mock stellar
 struct stellar
diff --git a/infra/session_manager/CMakeLists.txt b/infra/session_manager/CMakeLists.txt
index e632679..9b2a251 100644
--- a/infra/session_manager/CMakeLists.txt
+++ b/infra/session_manager/CMakeLists.txt
@@ -8,9 +8,8 @@ add_library(session_manager
     session_transition.cpp
 )
 target_include_directories(session_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/core)
+target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/core)
 target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/utils)
 target_link_libraries(session_manager timeout packet tcp_reassembly)
 
 add_subdirectory(test)
\ No newline at end of file
diff --git a/test/debug_plugin/CMakeLists.txt b/test/debug_plugin/CMakeLists.txt
index 3f45af8..a667f2c 100644
--- a/test/debug_plugin/CMakeLists.txt
+++ b/test/debug_plugin/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_library(debug_plugin SHARED debug_plugin.cpp)
 target_link_libraries(debug_plugin stellar_devel session_manager packet)
 target_include_directories(debug_plugin PUBLIC ${CMAKE_SOURCE_DIR}/include/)
-target_include_directories(debug_plugin PUBLIC ${CMAKE_SOURCE_DIR}/src/utils)
+target_include_directories(debug_plugin PUBLIC ${CMAKE_SOURCE_DIR}/infra/core/utils)
 set_target_properties(debug_plugin PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/version.map")
 
 file(COPY ./conf/ DESTINATION ./conf/)
\ No newline at end of file