fix

4 files changed, 19 insertions, 13 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a47cd1..f3bc9ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR}/include)
-
-include_directories(${CMAKE_SOURCE_DIR}/support/mpack)
-
 set(DP_TELEMETRY_SRC 
     ${CMAKE_CURRENT_SOURCE_DIR}/main.c 
     ${CMAKE_CURRENT_SOURCE_DIR}/config.c 
@@ -15,7 +11,12 @@ set(DP_TELEMETRY_SRC
     ${CMAKE_SOURCE_DIR}/support/mpack/mpack.c)
 
 add_executable(${PROJECT_NAME} ${DP_TELEMETRY_SRC})
-target_link_libraries(${PROJECT_NAME} libpcapng libmarsio maatframe MESA_prof_load libevent-static rdkafka libcmocka libzlog libcjson uuid pthread pcap)
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/support/mpack ${RDKAFKA_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_link_directories(${PROJECT_NAME} PRIVATE ${RDKAFKA_LIBRARY_DIRS})
+
+target_link_libraries(${PROJECT_NAME} libpcapng libmarsio maatframe MESA_prof_load libevent-static ${RDKAFKA_LIBRARIES} libcmocka libzlog libcjson uuid pthread pcap)
 
 # if(ENABLE_DEVELOP_MOCKING)
 #    target_link_options(${PROJECT_NAME} PRIVATE -Wl,--wrap=kafka_handle_create,--wrap=kafka_topic_new,--wrap=kafka_produce)
diff --git a/src/http_serv.c b/src/http_serv.c
index c9a3234..855a5b2 100644
--- a/src/http_serv.c
+++ b/src/http_serv.c
@@ -1,7 +1,7 @@
 #include "http_serv.h"
 #include "config.h"
 
-#include <MESA_prof_load.h>
+#include <MESA/MESA_prof_load.h>
 #include <assert.h>
 #include <event2/buffer.h>
 #include <event2/event.h>
diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
index c5a117d..e6e3881 100644
--- a/support/CMakeLists.txt
+++ b/support/CMakeLists.txt
@@ -80,9 +80,12 @@ set_property(TARGET MESA_prof_load PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_L
 set_property(TARGET MESA_prof_load PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
 
 ##### kafka
-add_library(rdkafka SHARED IMPORTED GLOBAL)
-set_property(TARGET rdkafka PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/librdkafka.so)
-set_property(TARGET rdkafka PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}/MESA)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(RDKAFKA REQUIRED rdkafka)
+# strange here
+message(STATUS "RDKAFKA_INCLUDE_DIRS: ${RDKAFKA_INCLUDE_DIRS}")
+message(STATUS "RDKAFKA_LIBRARY_DIRS: ${RDKAFKA_LIBRARY_DIRS}")
+message(STATUS "RDKAFKA_LIBRARIES: ${RDKAFKA_LIBRARIES}")
 
 ##### zlog
 ExternalProject_Add(zlog PREFIX zlog
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f5a5167..9eefb17 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR}/support/mpack)
-include_directories(${CMAKE_SOURCE_DIR}/include)
-
 set(DP_TRACE_TELEMETRY_SOURCES 
     ${CMAKE_SOURCE_DIR}/src/config.c 
     ${CMAKE_SOURCE_DIR}/src/job_ctx.c 
@@ -13,4 +10,9 @@ set(DP_TRACE_TELEMETRY_SOURCES
     ${CMAKE_SOURCE_DIR}/support/mpack/mpack.c)
 
 add_executable(cmocka_test cmocka_test.c  ${DP_TRACE_TELEMETRY_SOURCES})
-target_link_libraries(cmocka_test libpcapng libmarsio maatframe MESA_prof_load libevent-static rdkafka libcmocka libzlog libcjson uuid pthread pcap)
+
+target_include_directories(cmocka_test PRIVATE ${CMAKE_SOURCE_DIR}/support/mpack ${RDKAFKA_INCLUDE_DIRS})
+target_include_directories(cmocka_test PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_link_directories(cmocka_test PRIVATE ${RDKAFKA_LIBRARY_DIRS})
+
+target_link_libraries(cmocka_test libpcapng libmarsio maatframe MESA_prof_load libevent-static ${RDKAFKA_LIBRARIES} libcmocka libzlog libcjson uuid pthread pcap)