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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
path = contrib/pax_storage/src/cpp/contrib/googlebench
url = https://github.com/google/benchmark.git
[submodule "dependency/yyjson"]
path = dependency/yyjson
path = contrib/pax_storage/src/cpp/contrib/yyjson
url = https://github.com/ibireme/yyjson.git

2 changes: 1 addition & 1 deletion contrib/pax_storage/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if(USE_MANIFEST_API AND NOT USE_PAX_CATALOG)

set(BUILD_SHARED_LIBS ON)
set(CMAKE_INSTALL_SO_NO_EXE OFF)
add_subdirectory(${CMAKE_SOURCE_DIR}/../../dependency/yyjson ${CMAKE_BINARY_DIR}/yyjson_build)
add_subdirectory(src/cpp/contrib/yyjson ${CMAKE_BINARY_DIR}/yyjson_build)

set(BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS})
set(CMAKE_INSTALL_SO_NO_EXE ${SAVED_CMAKE_INSTALL_SO_NO_EXE})
Expand Down
2 changes: 1 addition & 1 deletion contrib/pax_storage/doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ git submodule update --init --recursive
```

The following submodules will be downloaded for building and tesing PAX:
- yyjson (`dependency/yyjson`)
- yyjson (`contrib/pax_storage/src/cpp/contrib/yyjson`)
- cpp-stub (`contrib/pax_storage/src/cpp/cotnrib`)
- googlebench (`contrib/pax_storage/src/cpp/cotnrib`)
- googletest (`contrib/pax_storage/src/cpp/cotnrib`)
Expand Down
2 changes: 1 addition & 1 deletion contrib/pax_storage/src/cpp/cmake/pax.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ if (USE_MANIFEST_API)
set(pax_catalog_src ${pax_catalog_src} catalog/pax_manifest_impl.cc)
else()
# use manifest implementation
set(pax_target_include ${pax_target_include} ${TOP_DIR}/dependency/yyjson/src)
set(pax_target_include ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR}/contrib/yyjson/src)
set(pax_catalog_src ${pax_catalog_src} ${manifest_src})
endif()
else() # USE_MANIFEST_API
Expand Down
Loading