mv memtracer to src

xiao45lp · Nov 19, 2024 · 7b7783f · 7b7783f
1 parent 4ad7c20
commit 7b7783f
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -155,7 +155,7 @@ IF (EXISTS /usr/local/lib64)
     LINK_DIRECTORIES (/usr/local/lib64)
 ENDIF ()
 
-INCLUDE_DIRECTORIES(. ${PROJECT_SOURCE_DIR}/deps /usr/local/include)
+INCLUDE_DIRECTORIES(. ${PROJECT_SOURCE_DIR}/deps ${PROJECT_SOURCE_DIR}/src /usr/local/include)
 
 IF(WITH_UNIT_TESTS)
     IF (ENABLE_COVERAGE)
@@ -170,7 +170,7 @@ SET(CMAKE_C_FLAGS ${CMAKE_COMMON_FLAGS})
 MESSAGE(STATUS "CMAKE_CXX_FLAGS is " ${CMAKE_CXX_FLAGS})
 
 # ADD_SUBDIRECTORY(src bin)  bin 为目标目录， 可以省略
-ADD_SUBDIRECTORY(deps)
+# ADD_SUBDIRECTORY(deps)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tools)
 

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(benchmark CONFIG REQUIRED)
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/observer)
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/observer)
 
 FILE(GLOB_RECURSE ALL_SRC *.cpp)
 # AUX_SOURCE_DIRECTORY 类似功能

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,7 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(observer)
 ADD_SUBDIRECTORY(obclient)
+
+if (WITH_MEMTRACER)
+    ADD_SUBDIRECTORY(memtracer)
+endif()
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 FILE(GLOB_RECURSE ALL_SRC  *.cpp)
 

diff --git a/deps/memtracer/CMakeLists.txt → src/memtracer/CMakeLists.txt b/deps/memtracer/CMakeLists.txt → src/memtracer/CMakeLists.txt
diff --git a/deps/memtracer/allocator.cpp → src/memtracer/allocator.cpp b/deps/memtracer/allocator.cpp → src/memtracer/allocator.cpp
diff --git a/deps/memtracer/allocator.h → src/memtracer/allocator.h b/deps/memtracer/allocator.h → src/memtracer/allocator.h
diff --git a/deps/memtracer/common.cpp → src/memtracer/common.cpp b/deps/memtracer/common.cpp → src/memtracer/common.cpp
diff --git a/deps/memtracer/common.h → src/memtracer/common.h b/deps/memtracer/common.h → src/memtracer/common.h
diff --git a/deps/memtracer/memtracer.cpp → src/memtracer/memtracer.cpp b/deps/memtracer/memtracer.cpp → src/memtracer/memtracer.cpp
diff --git a/deps/memtracer/memtracer.h → src/memtracer/memtracer.h b/deps/memtracer/memtracer.h → src/memtracer/memtracer.h
diff --git a/deps/memtracer/mt_info.cpp → src/memtracer/mt_info.cpp b/deps/memtracer/mt_info.cpp → src/memtracer/mt_info.cpp
diff --git a/deps/memtracer/mt_info.h → src/memtracer/mt_info.h b/deps/memtracer/mt_info.h → src/memtracer/mt_info.h
diff --git a/src/observer/CMakeLists.txt b/src/observer/CMakeLists.txt
@@ -1,6 +1,6 @@
 MESSAGE(STATUS "This is CMAKE_CURRENT_SOURCE_DIR dir " ${CMAKE_CURRENT_SOURCE_DIR})
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET (PARSER_WORKDIR ${CMAKE_CURRENT_SOURCE_DIR}/sql/parser)
 SET (PARSER_SOURCES ${PARSER_WORKDIR}/lex_sql.cpp ${PARSER_WORKDIR}/yacc_sql.cpp)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,6 +1,6 @@
 ADD_EXECUTABLE(clog_dump clog_dump.cpp)
 TARGET_LINK_LIBRARIES(clog_dump observer_static)
-TARGET_INCLUDE_DIRECTORIES(clog_dump PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/observer/)
+TARGET_INCLUDE_DIRECTORIES(clog_dump PRIVATE ${PROJECT_SOURCE_DIR}/src/observer/)
 
 # Target 必须在定义 ADD_EXECUTABLE 之后， programs 不受这个限制
 # TARGETS和PROGRAMS 的默认权限是OWNER_EXECUTE, GROUP_EXECUTE, 和WORLD_EXECUTE，即755权限， programs 都是处理脚步类

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
@@ -5,8 +5,6 @@ find_package(GTest CONFIG REQUIRED)
 
 include(GoogleTest)
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
-
 ADD_SUBDIRECTORY(common)
 IF (WITH_MEMTRACER)
     ADD_SUBDIRECTORY(memtracer)