Try fiz link with zstd

userver-framework · Jan 7, 2025 · 7f2f087 · 7f2f087
1 parent a3b6815
commit 7f2f087
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 16 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -67,7 +67,6 @@ jobs:
                     grpc_service \
                     hello_service \
                     postgres_service \
-                    kafka_service \
                     redis_service \
                     s3api \
                 ; do

diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt
@@ -20,7 +20,8 @@ userver_module(clickhouse
     DBTEST_DATABASES clickhouse
 )
 
-target_compile_options(${PROJECT_NAME} PUBLIC -Wno-pedantic)
+target_compile_options(${PROJECT_NAME} PUBLIC "-Wno-error=pedantic")
+
 
 _userver_directory_install(COMPONENT clickhouse FILES
 	  "${USERVER_ROOT_DIR}/cmake/modules/Findclickhouse-cpp.cmake"

diff --git a/cmake/SetupAbseil.cmake b/cmake/SetupAbseil.cmake
@@ -32,6 +32,3 @@ CPMAddPackage(
 
 mark_targets_as_system("${abseil-cpp_SOURCE_DIR}")
 write_package_stub(absl)
-if(TARGET absl_int128)
-  target_compile_options(absl_int128 PUBLIC -Wno-pedantic)
-endif()
diff --git a/cmake/SetupClickhouseCPP.cmake b/cmake/SetupClickhouseCPP.cmake
@@ -29,4 +29,3 @@ CPMAddPackage(
 )
 
 add_library(clickhouse-cpp ALIAS clickhouse-cpp-lib)
-target_compile_options(clickhouse-cpp-lib PUBLIC -Wno-pedantic)
diff --git a/cmake/modules/Findlibzstd.cmake b/cmake/modules/Findlibzstd.cmake
@@ -24,3 +24,4 @@ _userver_module_end()
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT TARGET zstd)
   add_library(zstd ALIAS libzstd)
 endif()
+add_library(zstd::zstd ALIAS libzstd)
diff --git a/conanfile.py b/conanfile.py
@@ -163,7 +163,7 @@ def requirements(self):
                 transitive_libs=True,
             )
         if self.options.with_kafka:
-            self.requires('librdkafka/2.6.0')
+            self.requires('librdkafka/2.6.1')
         if self.options.with_s3api:
             self.requires('pugixml/1.14')
 

diff --git a/kafka/CMakeLists.txt b/kafka/CMakeLists.txt
@@ -8,10 +8,10 @@ else()
   include(SetupRdKafka)
   target_link_libraries(RdKafka
     INTERFACE
-      ZLIB::ZLIB libzstd
+      ZLIB::ZLIB
       lz4::lz4 CURL::libcurl
       OpenSSL::SSL OpenSSL::Crypto
-      SASL2::SASL2
+      SASL2::SASL2 zstd::zstd
   )
 endif()
 

diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
@@ -249,14 +249,8 @@ if (USERVER_CONAN)
       yaml-cpp
       cryptopp::cryptopp
       rapidjson
+      zstd::libzstd_static
   )
-  # According to https://conan.io/center/recipes/zstd should be
-  # zstd::libzstd_static, but it does not work that way
-  if (TARGET zstd::libzstd_static)
-    target_link_libraries(${PROJECT_NAME} PRIVATE zstd::libzstd_static)
-  else()
-    target_link_libraries(${PROJECT_NAME} PRIVATE zstd::libzstd_shared)
-  endif()
 else()
   include(Stacktrace)
   _make_stacktrace_target(userver-stacktrace "${Boost_VERSION_STRING}")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,3 @@ CPMAddPackage(
		)

		add_library(clickhouse-cpp ALIAS clickhouse-cpp-lib)
		target_compile_options(clickhouse-cpp-lib PUBLIC -Wno-pedantic)