From 8054694f9c6c6356c9fd30bdf8795d767be13b8c Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 25 Jul 2023 09:10:41 +0200 Subject: [PATCH 1/2] lib: librdkafka: CMakeLists.txt: allow compilation without CXX support #7741 e.g. fluent-bit is a c-only library, so allow compilation without cxx Upstream: https://github.com/confluentinc/librdkafka/pull/4366 Signed-off-by: Thomas Devoogdt --- lib/librdkafka-2.4.0/CMakeLists.txt | 18 ++++++++++-- lib/librdkafka-2.4.0/examples/CMakeLists.txt | 31 +++++++++++++------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/lib/librdkafka-2.4.0/CMakeLists.txt b/lib/librdkafka-2.4.0/CMakeLists.txt index 7f3dd0fc68a..c1ee93062bd 100644 --- a/lib/librdkafka-2.4.0/CMakeLists.txt +++ b/lib/librdkafka-2.4.0/CMakeLists.txt @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2) include("packaging/cmake/parseversion.cmake") parseversion("src/rdkafka.h") -project(RdKafka VERSION ${RDKAFKA_VERSION}) +project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C) + +option(RDKAFKA_BUILD_CXX "Enable CXX support" ON) +if(RDKAFKA_BUILD_CXX) + enable_language(CXX) +endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/") @@ -181,7 +186,11 @@ endif() option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF) option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON) -option(RDKAFKA_BUILD_TESTS "Build tests" ON) + +if(RDKAFKA_BUILD_CXX) + option(RDKAFKA_BUILD_TESTS "Build tests" ON) +endif() + if(WIN32) option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON) endif(WIN32) @@ -279,7 +288,10 @@ install( ) add_subdirectory(src) -add_subdirectory(src-cpp) + +if(RDKAFKA_BUILD_CXX) + add_subdirectory(src-cpp) +endif() if(RDKAFKA_BUILD_EXAMPLES) add_subdirectory(examples) diff --git a/lib/librdkafka-2.4.0/examples/CMakeLists.txt b/lib/librdkafka-2.4.0/examples/CMakeLists.txt index 8c0079abeea..c9336b72926 100644 --- a/lib/librdkafka-2.4.0/examples/CMakeLists.txt +++ b/lib/librdkafka-2.4.0/examples/CMakeLists.txt @@ -5,8 +5,10 @@ endif(WIN32) add_executable(producer producer.c ${win32_sources}) target_link_libraries(producer PUBLIC rdkafka) -add_executable(producer_cpp producer.cpp ${win32_sources}) -target_link_libraries(producer_cpp PUBLIC rdkafka++) +if(RDKAFKA_BUILD_CXX) + add_executable(producer_cpp producer.cpp ${win32_sources}) + target_link_libraries(producer_cpp PUBLIC rdkafka++) +endif() add_executable(consumer consumer.c ${win32_sources}) target_link_libraries(consumer PUBLIC rdkafka) @@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka) add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources}) target_link_libraries(rdkafka_performance PUBLIC rdkafka) -add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources}) -target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++) +if(RDKAFKA_BUILD_CXX) + add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources}) + target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++) +endif() -add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources}) -target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++) +if(RDKAFKA_BUILD_CXX) + add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources}) + target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++) +endif() -add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources}) -target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++) +if(RDKAFKA_BUILD_CXX) + add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources}) + target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++) +endif() add_executable(misc misc.c ${win32_sources}) target_link_libraries(misc PUBLIC rdkafka) @@ -70,7 +78,8 @@ if(NOT WIN32) add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c) target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka) - add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) - target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) - + if(RDKAFKA_BUILD_CXX) + add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) + target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) + endif() endif(NOT WIN32) From f1ec3b7528c3960c59243d496843bb05ccddcd82 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 25 Jul 2023 10:00:36 +0200 Subject: [PATCH 2/2] CMakeLists.txt: disable cxx support for librdkafka #7741 Fluent-bit is c only, so no need to compile cxx. This fixes also a compile error in buildroot. Signed-off-by: Thomas Devoogdt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2e9fbf3b04..1f4ff689778 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -957,6 +957,7 @@ if(FLB_BACKTRACE) endif() if(FLB_IN_KAFKA OR FLB_OUT_KAFKA) + FLB_OPTION(RDKAFKA_BUILD_CXX Off) FLB_OPTION(RDKAFKA_BUILD_STATIC On) FLB_OPTION(RDKAFKA_BUILD_EXAMPLES Off) FLB_OPTION(RDKAFKA_BUILD_TESTS Off)