Skip to content

Commit

Permalink
Do not conflict with clickhouse LZ4
Browse files Browse the repository at this point in the history
  • Loading branch information
fdr400 committed Oct 25, 2024
1 parent 21ed512 commit 977665b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmake/SetupRdKafka.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ find_package(OpenSSL COMPONENTS SSL Crypto REQUIRED)
find_package(CURL REQUIRED)
find_package(libz REQUIRED)
find_package(libzstd REQUIRED)
find_package(lz4 REQUIRED)
find_package(LZ4 REQUIRED)

if(NOT USERVER_FORCE_DOWNLOAD_PACKAGES)
if(USERVER_DOWNLOAD_PACKAGE_KAFKA)
Expand Down
3 changes: 2 additions & 1 deletion cmake/modules/Findlz4.cmake → cmake/modules/FindLZ4.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
_userver_module_begin(
NAME lz4
NAME LZ4
VERSION 1.9.2
DEBIAN_NAMES liblz4-dev
FORMULA_NAMES lz4
PKG_CONFIG_NAMES liblz4
)

Expand Down
2 changes: 1 addition & 1 deletion kafka/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif()

userver_module(kafka
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
LINK_LIBRARIES_PRIVATE RdKafka sasl2 z libzstd lz4 CURL::libcurl OpenSSL::SSL OpenSSL::Crypto
LINK_LIBRARIES_PRIVATE RdKafka sasl2 z libzstd LZ4 CURL::libcurl OpenSSL::SSL OpenSSL::Crypto
DBTEST_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests"
DBTEST_LINK_LIBRARIES userver::kafka-utest
DBTEST_DATABASES kafka
Expand Down

0 comments on commit 977665b

Please sign in to comment.