Do not conflict with other lz4 trgets

userver-framework · Oct 25, 2024 · af0cefc · af0cefc
1 parent 567b052
commit af0cefc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cmake/SetupRdKafka.cmake b/cmake/SetupRdKafka.cmake
@@ -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)

diff --git a/cmake/UserverTestsuite.cmake b/cmake/UserverTestsuite.cmake
@@ -516,7 +516,7 @@ function(userver_add_ubench_test)
       NAME "${ARG_NAME}"
       DATABASES ${ARG_DATABASES}
       TEST_ENV ${ARG_TEST_ENV}
-      TEST_ARGS --benchmark_min_time=0 --benchmark_color=no
+      TEST_ARGS --benchmark_min_time=0s --benchmark_color=no
       DISABLE_GTEST_XML_OUTPUT ON
   )
 endfunction()

diff --git a/cmake/modules/FindLZ4.cmake → cmake/modules/FindLz4.cmake b/cmake/modules/FindLZ4.cmake → cmake/modules/FindLz4.cmake
@@ -1,5 +1,5 @@
 _userver_module_begin(
-    NAME LZ4
+    NAME Lz4
     VERSION 1.9.2
     DEBIAN_NAMES liblz4-dev
     FORMULA_NAMES lz4

diff --git a/kafka/CMakeLists.txt b/kafka/CMakeLists.txt
@@ -13,7 +13,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