Skip to content

Commit 0aaa788

Browse files
committed
Merge branch 'refactor/tdigest-rank' of github.com:donghao526/kvrocks into refactor/tdigest-rank
2 parents 7487397 + c2894a0 commit 0aaa788

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

cmake/jsoncons.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ include_guard()
2020
include(cmake/utils.cmake)
2121

2222
FetchContent_DeclareGitHubWithMirror(jsoncons
23-
danielaparker/jsoncons v1.4.3
24-
MD5=62dad69488c5618f56283ef14d6c1e16
23+
danielaparker/jsoncons v1.5.0
24+
MD5=34fabe18f29c4e5c514eaefb5bb50d09
2525
)
2626

2727
FetchContent_MakeAvailableWithArgs(jsoncons

cmake/modules/FindZLIB.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(zlib_SOURCE_DIR)
2222

2323
add_library(zlib_with_headers INTERFACE) # rocksdb use it
2424
target_include_directories(zlib_with_headers INTERFACE $<BUILD_INTERFACE:${zlib_SOURCE_DIR}> $<BUILD_INTERFACE:${zlib_BINARY_DIR}>)
25-
target_link_libraries(zlib_with_headers INTERFACE zlib)
25+
target_link_libraries(zlib_with_headers INTERFACE zlib-ng)
2626
add_library(ZLIB::ZLIB ALIAS zlib_with_headers)
27-
install(TARGETS zlib zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
27+
install(TARGETS zlib-ng zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
2828
endif()

cmake/zlib.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ include_guard()
2020
include(cmake/utils.cmake)
2121

2222
FetchContent_DeclareGitHubWithMirror(zlib
23-
zlib-ng/zlib-ng 2.2.4
24-
MD5=9fbaac3919af8d5a0ad5726ef9c7c30b
23+
zlib-ng/zlib-ng 2.3.2
24+
MD5=7818ea3f3ad80873674faf500fd12a0d
2525
)
2626

2727
FetchContent_MakeAvailableWithArgs(zlib

0 commit comments

Comments
 (0)