refactor: move include outside

update: version
Lord-Turmoil · Nov 21, 2024 · afa688b · afa688b
1 parent 5916a6a
commit afa688b
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,13 +5,13 @@ set(BINARY_NAME "mioc")
 set(CMAKE_CXX_STANDARD 11)
 
 project(${PROJECT_NAME}
-    VERSION 1.2.0
+    VERSION 1.2.1
     DESCRIPTION "A mini IoC implementation with C++"
     LANGUAGES CXX)
 
 set(LIBRARY_BASE_PATH "${PROJECT_SOURCE_DIR}")
 
-include_directories("${LIBRARY_BASE_PATH}/mioc/include")
+include_directories("${LIBRARY_BASE_PATH}/include")
 file(GLOB_RECURSE SRC_LIST CONFIGURE_DEPENDS "${LIBRARY_BASE_PATH}/src/*.cpp")
 add_library(${BINARY_NAME} ${SRC_LIST})
 target_include_directories(${BINARY_NAME} PUBLIC ${INCLUDE_DIRECTORIES})

diff --git a/mioc/include/mioc.h → include/mioc.h b/mioc/include/mioc.h → include/mioc.h
diff --git a/mioc/include/mioc/Macros.h → include/mioc/Macros.h b/mioc/include/mioc/Macros.h → include/mioc/Macros.h
@@ -5,9 +5,6 @@
 #ifndef _MIOC_MACROS_H_
 #define _MIOC_MACROS_H_
 
-#define MIOC_VERSION   "1.2.0"
-#define MIOC_PROJ_NAME "Tony's Mini IoC"
-
 #define MIOC_BEGIN                                                                                                     \
     namespace mioc                                                                                                     \
     {

diff --git a/mioc/include/mioc/ServiceContainer.h → include/mioc/ServiceContainer.h b/mioc/include/mioc/ServiceContainer.h → include/mioc/ServiceContainer.h
diff --git a/mioc/include/mioc/ServiceFactory.h → include/mioc/ServiceFactory.h b/mioc/include/mioc/ServiceFactory.h → include/mioc/ServiceFactory.h
diff --git a/mioc/include/mioc/SingletonContainer.h → include/mioc/SingletonContainer.h b/mioc/include/mioc/SingletonContainer.h → include/mioc/SingletonContainer.h