Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ if(EXISTS "${STDC_SHARED_LIB_SYMLINK}")
endif()

add_subdirectory(deps/oblib)
add_subdirectory(src/objit)
add_subdirectory(src)
add_subdirectory(sqlite-benchmark)

Expand Down
2 changes: 0 additions & 2 deletions deps/oblib/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ target_include_directories(
${CMAKE_SOURCE_DIR}/deps/oblib/src
${CMAKE_SOURCE_DIR}/deps/oblib/src/common
${CMAKE_SOURCE_DIR}/deps/easy/src/include
${CMAKE_SOURCE_DIR}/src/objit/include
${CMAKE_SOURCE_DIR}/src/objit/src
${DEP_DIR}/include
${DEP_DIR}/include/libxml2
$<$<NOT:$<PLATFORM_ID:Darwin>>:${SYS_INCLUDE_DIR}>
Expand Down
2 changes: 1 addition & 1 deletion deps/oblib/src/lib/geo/ob_geo_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "lib/number/ob_number_v2.h"
#include "common/object/ob_object.h"
#include "lib/geo/ob_geo_to_tree_visitor.h"
#include "objit/common/ob_item_type.h"
#include "common/ob_item_type.h"

namespace oceanbase
{
Expand Down
4 changes: 2 additions & 2 deletions deps/oblib/unittest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ function(oblib_addtest_simd mainfile)
add_executable(${testname} ${ARGV})
add_test(${testname} ${testname})
if(NOT APPLE)
target_link_libraries(${testname} PRIVATE objit oblib oblib_testbase -static-libgcc -static-libstdc++
target_link_libraries(${testname} PRIVATE oblib oblib_testbase -static-libgcc -static-libstdc++
-Wl,-znorelro -Wl,-T,${CMAKE_SOURCE_DIR}/rpm/ld.lds)
else()
target_link_libraries(${testname} PRIVATE objit oblib oblib_testbase)
target_link_libraries(${testname} PRIVATE oblib oblib_testbase)
endif()
if (${ARCHITECTURE} STREQUAL "x86_64")
target_compile_options(${testname}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target_include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/plugin/include)

target_compile_features(ob_base_without_pass INTERFACE cxx_std_11)
target_link_libraries(ob_base_without_pass INTERFACE oblib_base_without_pass objit_base
target_link_libraries(ob_base_without_pass INTERFACE oblib_base_without_pass
${OB_RELRO_FLAG}
$<$<NOT:$<PLATFORM_ID:Darwin>>:-Wl,-T,${CMAKE_SOURCE_DIR}/rpm/ld.lds>)
target_compile_definitions(ob_base_without_pass INTERFACE
Expand Down
4 changes: 0 additions & 4 deletions src/objit/.akconfig

This file was deleted.

18 changes: 0 additions & 18 deletions src/objit/.gitignore

This file was deleted.

Empty file removed src/objit/.gitmodules
Empty file.
80 changes: 0 additions & 80 deletions src/objit/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion src/objit/README.md

This file was deleted.

80 changes: 0 additions & 80 deletions src/objit/build.sh

This file was deleted.

131 changes: 0 additions & 131 deletions src/objit/cmake/MergeStaticLibs.cmake

This file was deleted.

Loading
Loading