move common dir to src

oceanbase · Nov 19, 2024 · 4f79f4f · 4f79f4f
1 parent 297b1f5
commit 4f79f4f
Show file tree

Hide file tree

Showing 289 changed files with 626 additions and 2,162 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,9 +171,7 @@ MESSAGE(STATUS "CMAKE_CXX_FLAGS is " ${CMAKE_CXX_FLAGS})
 
 # ADD_SUBDIRECTORY(src bin)  bin 为目标目录， 可以省略
 ADD_SUBDIRECTORY(deps)
-ADD_SUBDIRECTORY(src/obclient)
-ADD_SUBDIRECTORY(src/observer)
-ADD_SUBDIRECTORY(test/perf)
+ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tools)
 
 IF (WITH_BENCHMARK)

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/observer)
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/observer)
 
 FILE(GLOB_RECURSE ALL_SRC *.cpp)
 # AUX_SOURCE_DIRECTORY 类似功能

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-ADD_SUBDIRECTORY(common)
 if (WITH_MEMTRACER)
     ADD_SUBDIRECTORY(memtracer)
 endif()
diff --git a/deps/common/CMakeLists.txt b/deps/common/CMakeLists.txt
diff --git a/deps/common/metrics/console_reporter.cpp b/deps/common/metrics/console_reporter.cpp
diff --git a/deps/common/metrics/console_reporter.h b/deps/common/metrics/console_reporter.h
diff --git a/deps/common/metrics/histogram_snapshot.cpp b/deps/common/metrics/histogram_snapshot.cpp
diff --git a/deps/common/metrics/histogram_snapshot.h b/deps/common/metrics/histogram_snapshot.h
diff --git a/deps/common/metrics/log_reporter.cpp b/deps/common/metrics/log_reporter.cpp