mirror of
https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka.git
synced 2025-10-30 18:17:58 +00:00
Merge
This commit is contained in:
@@ -10,8 +10,8 @@ include(CMakePackageConfigHelpers)
|
||||
|
||||
# Set the version number.
|
||||
set(CPPKAFKA_VERSION_MAJOR 0)
|
||||
set(CPPKAFKA_VERSION_MINOR 3)
|
||||
set(CPPKAFKA_VERSION_REVISION 1)
|
||||
set(CPPKAFKA_VERSION_MINOR 4)
|
||||
set(CPPKAFKA_VERSION_REVISION 0)
|
||||
set(CPPKAFKA_VERSION "${CPPKAFKA_VERSION_MAJOR}.${CPPKAFKA_VERSION_MINOR}.${CPPKAFKA_VERSION_REVISION}")
|
||||
set(RDKAFKA_MIN_VERSION "0.9.4")
|
||||
set(RDKAFKA_MIN_VERSION_HEX 0x00090400)
|
||||
@@ -28,7 +28,7 @@ if (NOT CMAKE_CXX_FLAGS)
|
||||
add_definitions("-DNOGDI=1")
|
||||
add_definitions("-DNOMINMAX=1")
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
|
||||
set(CMAKE_CXX_FLAGS "-Wall")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -55,8 +55,11 @@ try_compile(RdKafka_FOUND ${CMAKE_CURRENT_BINARY_DIR}
|
||||
|
||||
if (RdKafka_FOUND)
|
||||
add_library(RdKafka::rdkafka ${RDKAFKA_LIBRARY_TYPE} IMPORTED GLOBAL)
|
||||
set(RDKAFKA_DEPENDENCIES pthread)
|
||||
# set(RDKAFKA_DEPENDENCIES pthread rt crypto dl z)
|
||||
if (UNIX AND NOT APPLE)
|
||||
set(RDKAFKA_DEPENDENCIES pthread rt ssl crypto dl z)
|
||||
else()
|
||||
set(RDKAFKA_DEPENDENCIES pthread ssl crypto dl z)
|
||||
endif()
|
||||
set_target_properties(RdKafka::rdkafka PROPERTIES
|
||||
IMPORTED_NAME RdKafka
|
||||
IMPORTED_LOCATION "${RdKafka_LIBRARY_PATH}"
|
||||
|
||||
Reference in New Issue
Block a user