0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118
  1. From 29be5275f6f7e15aca768e9b235998abc5a604e2 Mon Sep 17 00:00:00 2001
  2. From: Thomas Devoogdt <thomas.devoogdt@barco.com>
  3. Date: Tue, 25 Jul 2023 09:10:41 +0200
  4. Subject: [PATCH] lib: librdkafka: CMakeLists.txt: allow compilation without
  5. CXX support #7741
  6. e.g. fluent-bit is a c-only library, so allow compilation without cxx
  7. Upstream: https://github.com/confluentinc/librdkafka/pull/4366
  8. Upstream: https://github.com/fluent/fluent-bit/pull/7765
  9. Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
  10. ---
  11. lib/librdkafka-2.3.0/CMakeLists.txt | 18 ++++++++++--
  12. lib/librdkafka-2.3.0/examples/CMakeLists.txt | 31 +++++++++++++-------
  13. 2 files changed, 35 insertions(+), 14 deletions(-)
  14. diff --git a/lib/librdkafka-2.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt
  15. index 7f3dd0fc6..c1ee93062 100644
  16. --- a/lib/librdkafka-2.3.0/CMakeLists.txt
  17. +++ b/lib/librdkafka-2.3.0/CMakeLists.txt
  18. @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2)
  19. include("packaging/cmake/parseversion.cmake")
  20. parseversion("src/rdkafka.h")
  21. -project(RdKafka VERSION ${RDKAFKA_VERSION})
  22. +project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C)
  23. +
  24. +option(RDKAFKA_BUILD_CXX "Enable CXX support" ON)
  25. +if(RDKAFKA_BUILD_CXX)
  26. + enable_language(CXX)
  27. +endif()
  28. set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/")
  29. @@ -181,7 +186,11 @@ endif()
  30. option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF)
  31. option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON)
  32. -option(RDKAFKA_BUILD_TESTS "Build tests" ON)
  33. +
  34. +if(RDKAFKA_BUILD_CXX)
  35. + option(RDKAFKA_BUILD_TESTS "Build tests" ON)
  36. +endif()
  37. +
  38. if(WIN32)
  39. option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON)
  40. endif(WIN32)
  41. @@ -279,7 +288,10 @@ install(
  42. )
  43. add_subdirectory(src)
  44. -add_subdirectory(src-cpp)
  45. +
  46. +if(RDKAFKA_BUILD_CXX)
  47. + add_subdirectory(src-cpp)
  48. +endif()
  49. if(RDKAFKA_BUILD_EXAMPLES)
  50. add_subdirectory(examples)
  51. diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt
  52. index 8c0079abe..c9336b729 100644
  53. --- a/lib/librdkafka-2.3.0/examples/CMakeLists.txt
  54. +++ b/lib/librdkafka-2.3.0/examples/CMakeLists.txt
  55. @@ -5,8 +5,10 @@ endif(WIN32)
  56. add_executable(producer producer.c ${win32_sources})
  57. target_link_libraries(producer PUBLIC rdkafka)
  58. -add_executable(producer_cpp producer.cpp ${win32_sources})
  59. -target_link_libraries(producer_cpp PUBLIC rdkafka++)
  60. +if(RDKAFKA_BUILD_CXX)
  61. + add_executable(producer_cpp producer.cpp ${win32_sources})
  62. + target_link_libraries(producer_cpp PUBLIC rdkafka++)
  63. +endif()
  64. add_executable(consumer consumer.c ${win32_sources})
  65. target_link_libraries(consumer PUBLIC rdkafka)
  66. @@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka)
  67. add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources})
  68. target_link_libraries(rdkafka_performance PUBLIC rdkafka)
  69. -add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
  70. -target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
  71. +if(RDKAFKA_BUILD_CXX)
  72. + add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
  73. + target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
  74. +endif()
  75. -add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
  76. -target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
  77. +if(RDKAFKA_BUILD_CXX)
  78. + add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
  79. + target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
  80. +endif()
  81. -add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
  82. -target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
  83. +if(RDKAFKA_BUILD_CXX)
  84. + add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
  85. + target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
  86. +endif()
  87. add_executable(misc misc.c ${win32_sources})
  88. target_link_libraries(misc PUBLIC rdkafka)
  89. @@ -70,7 +78,8 @@ if(NOT WIN32)
  90. add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c)
  91. target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka)
  92. - add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
  93. - target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
  94. -
  95. + if(RDKAFKA_BUILD_CXX)
  96. + add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
  97. + target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
  98. + endif()
  99. endif(NOT WIN32)
  100. --
  101. 2.34.1