[cppkafka] update to 0.4.1 (#47199)

This commit is contained in:
toge 2025-09-04 18:20:03 +09:00 committed by GitHub
parent ba91c9ae57
commit 2dc54dfc5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 72 deletions

View File

@ -1,38 +0,0 @@
From fb7cbb0648948b51f71aefaa6b2354846f72439f Mon Sep 17 00:00:00 2001
From: Nikita Vakula <programmistov.programmist@gmail.com>
Date: Mon, 1 May 2023 23:12:09 +0200
Subject: [PATCH 1/2] Use correct rdkafka .pc
Signed-off-by: Nikita Vakula <programmistov.programmist@gmail.com>
---
CMakeLists.txt | 1 +
cmake/cppkafka.pc.in | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4e44e6..e34c071 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,6 +92,7 @@ endif()
if (CPPKAFKA_RDKAFKA_STATIC_LIB)
add_definitions("-DLIBRDKAFKA_STATICLIB")
+ set(RDKAFKA_STATIC "-static")
endif()
if (NOT CPPKAFKA_CONFIG_DIR)
diff --git a/cmake/cppkafka.pc.in b/cmake/cppkafka.pc.in
index b5d432c..4e50860 100644
--- a/cmake/cppkafka.pc.in
+++ b/cmake/cppkafka.pc.in
@@ -9,6 +9,6 @@ Url: https://github.com/mfontanini/cppkafka
Description: C++ wrapper library on top of RdKafka
Version: @CPPKAFKA_VERSION@
Requires:
-Requires.private: rdkafka >= 0.9.4
+Requires.private: rdkafka@RDKAFKA_STATIC@ >= 0.9.4
Libs: -L${libdir} -L${sharedlibdir} -lcppkafka
Cflags: -I${includedir} -I${includedir}/cppkafka -I@Boost_INCLUDE_DIRS@
--
2.37.1 (Apple Git-137.1)

View File

@ -1,27 +0,0 @@
From e2c9c0a1cee07c6cacedd682d3506b447c2c561b Mon Sep 17 00:00:00 2001
From: Nikita Vakula <programmistov.programmist@gmail.com>
Date: Mon, 1 May 2023 23:11:19 +0200
Subject: [PATCH 2/2] Remove min/max macros
Signed-off-by: Nikita Vakula <programmistov.programmist@gmail.com>
---
src/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b8649b..5c818ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,6 +36,9 @@ set(NAMESPACE "${PROJECT_NAME}::")
set(TARGET_EXPORT_NAME ${PROJECT_NAME}Targets)
add_library(${TARGET_NAME} ${CPPKAFKA_LIBRARY_TYPE} ${SOURCES})
+if (MSVC)
+ target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX)
+endif ()
target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include/cppkafka>)
set_target_properties(${TARGET_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}"
--
2.37.1 (Apple Git-137.1)

View File

@ -1,12 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mfontanini/cppkafka
REF "${VERSION}"
SHA512 86ac1500bdf6746a5e44e9ca4a4063eabcacec68b26c6846f7e7d47fe947309fc98a47986ab060d793096665d1cdc24044334267eb579cdb191f539bf96a3294
REF "v${VERSION}"
SHA512 dce4da452cb98d854714a0ab7ab5e85a078d5e1c023c05344ea1a63d08112c25d32a6209bc29cfbaefc2b26abfab02e72081baa68528a23ec610c208f4d34d9f
HEAD_REF master
PATCHES
0001-Fix-static-lib.patch
0002-Remove-min-max-macros.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")

View File

@ -1,6 +1,6 @@
{
"name": "cppkafka",
"version": "0.4.0",
"version": "0.4.1",
"description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.",
"homepage": "https://github.com/mfontanini/cppkafka",
"license": "BSD-2-Clause",

View File

@ -2065,7 +2065,7 @@
"port-version": 0
},
"cppkafka": {
"baseline": "0.4.0",
"baseline": "0.4.1",
"port-version": 0
},
"cppmicroservices": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "394db17396a2011f3915423a3c085a9e3f759769",
"version": "0.4.1",
"port-version": 0
},
{
"git-tree": "708cf007605104bc59394d47c9937b203c155b37",
"version": "0.4.0",