Skip to content

Commit ad800a5

Browse files
author
Alexander Damian
committed
Added RdKafka hex version so that FindRdKafka.cmake can compile the test code. Changed find_dependency to find_package for the RdKafka config so that the script is not automatically exited on failure
1 parent 4bddb22 commit ad800a5

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

cmake/FindRdKafka.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ find_package_handle_standard_args(RDKAFKA DEFAULT_MSG
5454
)
5555

5656
set(CONTENTS "#include <librdkafka/rdkafka.h>\n #if RD_KAFKA_VERSION >= ${RDKAFKA_MIN_VERSION_HEX}\n int main() { }\n #endif")
57-
set(FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/rdkafka_version_test.c)
57+
set(FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/rdkafka_version_test.cpp)
5858
file(WRITE ${FILE_NAME} ${CONTENTS})
5959

6060
try_compile(RdKafka_FOUND ${CMAKE_CURRENT_BINARY_DIR}

cmake/config.cmake.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ include(CMakeFindDependencyMacro)
55
# Add FindRdKafka.cmake
66
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}")
77

8+
set(RDKAFKA_MIN_VERSION_HEX "@RDKAFKA_MIN_VERSION_HEX@")
9+
810
# Find boost optional
911
find_dependency(Boost REQUIRED)
1012

1113
# Try to find the RdKafka configuration file if present.
1214
# This will search default system locations as well as RdKafka_ROOT and RdKafka_Dir paths if specified.
13-
find_dependency(RdKafka QUIET CONFIG)
15+
find_package(RdKafka QUIET CONFIG)
1416
set(RDKAFKA_TARGET_IMPORTS ${RdKafka_FOUND})
1517
if (NOT RdKafka_FOUND)
1618
find_dependency(RdKafka REQUIRED MODULE)

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ configure_package_config_file(
8686
"${PROJECT_SOURCE_DIR}/cmake/config.cmake.in"
8787
"${CONFIG_FILE}"
8888
INSTALL_DESTINATION "${CPPKAFKA_CONFIG_DIR}"
89-
PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR
89+
PATH_VARS RDKAFKA_MIN_VERSION_HEX CMAKE_INSTALL_PREFIX CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR
9090
)
9191

9292
# Generate version file

0 commit comments

Comments
 (0)