0002-lib-librdkafka-only-require-a-C-compiler.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118
  1. From dea6fb0138d9356ebdc4983a61c185bc759d86b0 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: only require a C compiler
  5. Upstream: https://github.com/confluentinc/librdkafka/pull/4366
  6. Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
  7. ---
  8. lib/librdkafka-2.8.0/CMakeLists.txt | 22 ++++++++++++--
  9. lib/librdkafka-2.8.0/examples/CMakeLists.txt | 31 +++++++++++++-------
  10. 2 files changed, 39 insertions(+), 14 deletions(-)
  11. diff --git a/lib/librdkafka-2.8.0/CMakeLists.txt b/lib/librdkafka-2.8.0/CMakeLists.txt
  12. index f3d05bad7..8ef47053a 100644
  13. --- a/lib/librdkafka-2.8.0/CMakeLists.txt
  14. +++ b/lib/librdkafka-2.8.0/CMakeLists.txt
  15. @@ -3,7 +3,16 @@ cmake_minimum_required(VERSION 3.5)
  16. include("packaging/cmake/parseversion.cmake")
  17. parseversion("src/rdkafka.h")
  18. -project(RdKafka VERSION ${RDKAFKA_VERSION})
  19. +project(RdKafka VERSION ${RDKAFKA_VERSION} LANGUAGES C)
  20. +
  21. +# Check for CXX support
  22. +include(CheckLanguage)
  23. +check_language(CXX)
  24. +if(CMAKE_CXX_COMPILER)
  25. + enable_language(CXX)
  26. +else()
  27. + message(STATUS "C++ compiler not found, skipping C++ support")
  28. +endif()
  29. set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/packaging/cmake/Modules/")
  30. @@ -181,7 +190,11 @@ endif()
  31. option(RDKAFKA_BUILD_STATIC "Build static rdkafka library" OFF)
  32. option(RDKAFKA_BUILD_EXAMPLES "Build examples" ON)
  33. -option(RDKAFKA_BUILD_TESTS "Build tests" ON)
  34. +
  35. +if(CMAKE_CXX_COMPILER)
  36. + option(RDKAFKA_BUILD_TESTS "Build tests" ON)
  37. +endif()
  38. +
  39. if(WIN32)
  40. option(WITHOUT_WIN32_CONFIG "Avoid including win32_config.h on cmake builds" ON)
  41. endif(WIN32)
  42. @@ -279,7 +292,10 @@ install(
  43. )
  44. add_subdirectory(src)
  45. -add_subdirectory(src-cpp)
  46. +
  47. +if(CMAKE_CXX_COMPILER)
  48. + add_subdirectory(src-cpp)
  49. +endif()
  50. if(RDKAFKA_BUILD_EXAMPLES)
  51. add_subdirectory(examples)
  52. diff --git a/lib/librdkafka-2.8.0/examples/CMakeLists.txt b/lib/librdkafka-2.8.0/examples/CMakeLists.txt
  53. index 91851d2cb..6874195ce 100644
  54. --- a/lib/librdkafka-2.8.0/examples/CMakeLists.txt
  55. +++ b/lib/librdkafka-2.8.0/examples/CMakeLists.txt
  56. @@ -5,8 +5,10 @@ endif(WIN32)
  57. add_executable(producer producer.c ${win32_sources})
  58. target_link_libraries(producer PUBLIC rdkafka)
  59. -add_executable(producer_cpp producer.cpp ${win32_sources})
  60. -target_link_libraries(producer_cpp PUBLIC rdkafka++)
  61. +if(CMAKE_CXX_COMPILER)
  62. + add_executable(producer_cpp producer.cpp ${win32_sources})
  63. + target_link_libraries(producer_cpp PUBLIC rdkafka++)
  64. +endif()
  65. add_executable(consumer consumer.c ${win32_sources})
  66. target_link_libraries(consumer PUBLIC rdkafka)
  67. @@ -14,14 +16,20 @@ target_link_libraries(consumer PUBLIC rdkafka)
  68. add_executable(rdkafka_performance rdkafka_performance.c ${win32_sources})
  69. target_link_libraries(rdkafka_performance PUBLIC rdkafka)
  70. -add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
  71. -target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
  72. +if(CMAKE_CXX_COMPILER)
  73. + add_executable(rdkafka_example_cpp rdkafka_example.cpp ${win32_sources})
  74. + target_link_libraries(rdkafka_example_cpp PUBLIC rdkafka++)
  75. +endif()
  76. -add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
  77. -target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
  78. +if(CMAKE_CXX_COMPILER)
  79. + add_executable(rdkafka_complex_consumer_example_cpp rdkafka_complex_consumer_example.cpp ${win32_sources})
  80. + target_link_libraries(rdkafka_complex_consumer_example_cpp PUBLIC rdkafka++)
  81. +endif()
  82. -add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
  83. -target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
  84. +if(CMAKE_CXX_COMPILER)
  85. + add_executable(openssl_engine_example_cpp openssl_engine_example.cpp ${win32_sources})
  86. + target_link_libraries(openssl_engine_example_cpp PUBLIC rdkafka++)
  87. +endif()
  88. add_executable(misc misc.c ${win32_sources})
  89. target_link_libraries(misc PUBLIC rdkafka)
  90. @@ -73,7 +81,8 @@ if(NOT WIN32)
  91. add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c)
  92. target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka)
  93. - add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
  94. - target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
  95. -
  96. + if(CMAKE_CXX_COMPILER)
  97. + add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp)
  98. + target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++)
  99. + endif()
  100. endif(NOT WIN32)
  101. --
  102. 2.43.0