Merge branch 'main' into issue_479

.gitpod.yml

@@ -1,10 +1,3 @@
-github:
-  prebuilds:
-    master: false
-    branches: false
-tasks:
-  - name: install dependencies
-    init: |
-      sudo apt install cmake flex bison texinfo libreadline-dev -y
-      sudo bash build.sh init
-      echo -e "\033[32m\nDependency installed successfully\033[0m"
+coreDump:
+  enabled: true
+image: oceanbase/miniob:latest

CMakeLists.txt

@@ -7,7 +7,7 @@ MESSAGE(STATUS "This is Project source dir " ${PROJECT_SOURCE_DIR})
 MESSAGE(STATUS "This is PROJECT_BINARY_DIR dir " ${PROJECT_BINARY_DIR})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${PROJECT_SOURCE_DIR}/deps/3rd/usr/local")
+SET(CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/deps/3rd/usr/local;/usr/local;${CMAKE_PREFIX_PATH}")
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # 设置默认构建类型为 Debug
@@ -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,10 +170,8 @@ 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(src/obclient)
-ADD_SUBDIRECTORY(src/observer)
-ADD_SUBDIRECTORY(test/perf)
+# ADD_SUBDIRECTORY(deps)
+ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tools)
 
 IF (WITH_BENCHMARK)