Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: offline with git submodule #3787

Merged
merged 16 commits into from
Mar 4, 2024
Merged

feat: offline with git submodule #3787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f859e3b
including farmhash and rapidjson using git submodule
QiChenX Feb 27, 2024
5d15610
test
QiChenX Feb 27, 2024
4766e71
branch version of offline docker
QiChenX Feb 28, 2024
ad43176
modified dockerfile
QiChenX Feb 28, 2024
f1dd25d
test
QiChenX Feb 28, 2024
8b30af7
copy local OpenMLDB into docker
QiChenX Feb 28, 2024
84d3802
check submodule in makefile configure
QiChenX Feb 28, 2024
a4d420d
modified: Makefile
QiChenX Feb 28, 2024
3e8c003
modified CMakeLists and move farmhash into code base
QiChenX Mar 1, 2024
3c73986
renamed dockerfile
QiChenX Mar 1, 2024
9aacfc6
save changes for merge
QiChenX Mar 1, 2024
30ec2c5
merge main branch
QiChenX Mar 1, 2024
4458966
fix failed checks
QiChenX Mar 1, 2024
26c075a
update farmhash cmakelists output dir
QiChenX Mar 4, 2024
7688d84
Merge branch 'main' into feat/offline_with_submodule
QiChenX Mar 4, 2024
a8413c8
Merge branch 'main' into feat/offline_with_submodule
QiChenX Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "gflags"]
path = contrib/gflags
url = https://github.com/gflags/gflags
[submodule "contrib/rapidjson"]
dl239 marked this conversation as resolved.
Show resolved Hide resolved
path = contrib/rapidjson
url = https://github.com/Tencent/rapidjson.git
5 changes: 1 addition & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,7 @@ else()
set(RocksDB_LIB ${RocksDB_LIBRARY})
endif()

# third party sources
include(FetchContent)
set(FETCHCONTENT_QUIET OFF)
include(farmhash)
include(rapidjson)

# contrib libs
add_subdirectory(contrib EXCLUDE_FROM_ALL)
Expand Down Expand Up @@ -298,6 +294,7 @@ include_directories(
${LLVM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${CMAKE_PREFIX_PATH}/include
${PROJECT_SOURCE_DIR}/contrib/rapidjson/include
QiChenX marked this conversation as resolved.
Show resolved Hide resolved
)

link_directories(
Expand Down
17 changes: 0 additions & 17 deletions cmake/farmhash.cmake
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions cmake/rapidjson.cmake
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions contrib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ function(add_contrib cmake_folder)
endfunction()

add_contrib(simdjson)
add_contrib(rapidjson)
add_contrib(farmhash)

if (BUILD_SHARED_LIBS)
add_contrib(gflags-cmake gflags)
Expand Down
12 changes: 12 additions & 0 deletions contrib/farmhash/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

add_library(farmhash ${CMAKE_CURRENT_SOURCE_DIR}/src/farmhash.cc)
target_include_directories(farmhash SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/")
set_target_properties(farmhash
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
target_compile_definitions(farmhash
PUBLIC NAMESPACE_FOR_HASH_FUNCTIONS=farmhash)

add_library(op_contrib::farmhash ALIAS farmhash)