scottk/wlan-cloud-lib-cppkafka
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka.git synced 2025-11-01 11:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
stephb9959
2022-08-01 21:55:17 -07:00
parent 14f5261806
commit 03b12561af
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -10,8 +10,8 @@ include(CMakePackageConfigHelpers)
# Set the version number. # Set the version number.
set(CPPKAFKA_VERSION_MAJOR 0) set(CPPKAFKA_VERSION_MAJOR 0)
set(CPPKAFKA_VERSION_MINOR 3) set(CPPKAFKA_VERSION_MINOR 4)
set(CPPKAFKA_VERSION_REVISION 1) set(CPPKAFKA_VERSION_REVISION 0)
set(CPPKAFKA_VERSION "${CPPKAFKA_VERSION_MAJOR}.${CPPKAFKA_VERSION_MINOR}.${CPPKAFKA_VERSION_REVISION}") set(CPPKAFKA_VERSION "${CPPKAFKA_VERSION_MAJOR}.${CPPKAFKA_VERSION_MINOR}.${CPPKAFKA_VERSION_REVISION}")
set(RDKAFKA_MIN_VERSION "0.9.4") set(RDKAFKA_MIN_VERSION "0.9.4")
set(RDKAFKA_MIN_VERSION_HEX 0x00090400) set(RDKAFKA_MIN_VERSION_HEX 0x00090400)
@@ -28,7 +28,7 @@ if (NOT CMAKE_CXX_FLAGS)
add_definitions("-DNOGDI=1") add_definitions("-DNOGDI=1")
add_definitions("-DNOMINMAX=1") add_definitions("-DNOMINMAX=1")
else() else()
set(CMAKE_CXX_FLAGS "-std=c++11 -Wall") set(CMAKE_CXX_FLAGS "-Wall")
endif() endif()
endif() endif()

7
cmake/FindRdKafka.cmake
View File

@@ -55,8 +55,11 @@ try_compile(RdKafka_FOUND ${CMAKE_CURRENT_BINARY_DIR}
if (RdKafka_FOUND) if (RdKafka_FOUND)
add_library(RdKafka::rdkafka ${RDKAFKA_LIBRARY_TYPE} IMPORTED GLOBAL) add_library(RdKafka::rdkafka ${RDKAFKA_LIBRARY_TYPE} IMPORTED GLOBAL)
set(RDKAFKA_DEPENDENCIES pthread) if (UNIX AND NOT APPLE)
# set(RDKAFKA_DEPENDENCIES pthread rt crypto dl z) 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 set_target_properties(RdKafka::rdkafka PROPERTIES
IMPORTED_NAME RdKafka IMPORTED_NAME RdKafka
IMPORTED_LOCATION "${RdKafka_LIBRARY_PATH}" IMPORTED_LOCATION "${RdKafka_LIBRARY_PATH}"