Skip to content

Commit 58111bd

Browse files
author
Alexander Damian
committed
Removed RdKafka_LIBRARY_DIR as per code review
1 parent fd19648 commit 58111bd

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ if (NOT CMAKE_CXX_FLAGS)
3232
endif()
3333
endif()
3434

35-
# Set default search directories for find_path, find_library, find_package, etc...
36-
if (NOT WIN32)
37-
list(APPEND CMAKE_PREFIX_PATH /usr/lib /usr/local/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
38-
list(APPEND CMAKE_INCLUDE_PATH /usr/include /usr/local/include)
39-
endif()
40-
4135
# Set output directories
4236
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
4337
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)

cmake/FindRdKafka.cmake

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# This find module helps find the RdKafka module. It exports the following variables:
22
# - RdKafka_INCLUDE_DIR : The directory where rdkafka.h is located.
33
# - RdKafka_LIBNAME : The name of the library, i.e. librdkafka.a, librdkafka.so, etc.
4-
# - RdKafka_LIBRARY_DIR : The directory where the library is located.
5-
# - RdKafka_LIBRARY_PATH : The full library path i.e. ${RdKafka_LIBRARY_DIR}/${RdKafka_LIBNAME}
4+
# - RdKafka_LIBRARY_PATH : The full library path i.e. <path_to_binaries>/${RdKafka_LIBNAME}
65
# - RdKafka::rdkafka : Imported library containing all above properties set.
76

87
if (CPPKAFKA_RDKAFKA_STATIC_LIB)
@@ -22,14 +21,9 @@ find_path(RdKafka_INCLUDE_DIR
2221
HINTS ${RdKafka_ROOT}/include
2322
)
2423

25-
find_path(RdKafka_LIBRARY_DIR
26-
NAMES ${RdKafka_LIBNAME} rdkafka
27-
HINTS ${RdKafka_ROOT}/lib ${RdKafka_ROOT}/lib64
28-
)
29-
3024
find_library(RdKafka_LIBRARY_PATH
3125
NAMES ${RdKafka_LIBNAME} rdkafka
32-
HINTS ${RdKafka_LIBRARY_DIR}
26+
HINTS ${RdKafka_ROOT}/lib ${RdKafka_ROOT}/lib64
3327
)
3428

3529
# Check lib paths
@@ -42,13 +36,11 @@ if (CPPKAFKA_CMAKE_VERBOSE)
4236
message(STATUS "RdKafka_INCLUDE_DIR = ${RdKafka_INCLUDE_DIR}")
4337
message(STATUS "RdKafka_LIBNAME = ${RdKafka_LIBNAME}")
4438
message(STATUS "RdKafka_LIBRARY_PATH = ${RdKafka_LIBRARY_PATH}")
45-
message(STATUS "RdKafka_LIBRARY_DIR = ${RdKafka_LIBRARY_DIR}")
4639
endif()
4740

4841
include(FindPackageHandleStandardArgs)
4942
find_package_handle_standard_args(RDKAFKA DEFAULT_MSG
5043
RdKafka_LIBNAME
51-
RdKafka_LIBRARY_DIR
5244
RdKafka_LIBRARY_PATH
5345
RdKafka_INCLUDE_DIR
5446
)
@@ -68,13 +60,12 @@ if (RdKafka_FOUND)
6860
IMPORTED_NAME RdKafka
6961
IMPORTED_LOCATION "${RdKafka_LIBRARY_PATH}"
7062
INTERFACE_INCLUDE_DIRECTORIES "${RdKafka_INCLUDE_DIR}"
71-
INTERFACE_LINK_DIRECTORIES "${RdKafka_LIBRARY_DIR}"
7263
INTERFACE_LINK_LIBRARIES "${RDKAFKA_DEPENDENCIES}")
7364
message(STATUS "Found valid rdkafka version")
7465
mark_as_advanced(
7566
RDKAFKA_LIBRARY
76-
RdKafka_LIBRARY_DIR
7767
RdKafka_INCLUDE_DIR
68+
RdKafka_LIBRARY_PATH
7869
)
7970
else()
8071
message(FATAL_ERROR "Failed to find valid rdkafka version")

0 commit comments

Comments
 (0)