diff --git a/plugin/business/pangu-http/CMakeLists.txt b/plugin/business/pangu-http/CMakeLists.txt index d18ed77..2b93b94 100644 --- a/plugin/business/pangu-http/CMakeLists.txt +++ b/plugin/business/pangu-http/CMakeLists.txt @@ -1,11 +1,11 @@ add_library(pangu-http src/pangu_logger.cpp src/pangu_http.cpp src/pattern_replace.cpp src/pangu_web_cache.cpp) -target_link_libraries(pangu-http common http tango-cache-client) -target_link_libraries(pangu-http librdkafka-static ctemplate-static cjson pcre2-static) -target_link_libraries(pangu-http maatframe) +target_link_libraries(pangu-http PUBLIC common http tango-cache-client) +target_link_libraries(pangu-http PUBLIC librdkafka ctemplate-static cjson pcre2-static pthread) +target_link_libraries(pangu-http PUBLIC maatframe) add_executable(test_pattern_replace src/test_pattern_replace.cpp src/pattern_replace.cpp) target_link_libraries(test_pattern_replace common gtest pcre2-static) file(COPY test_data DESTINATION ./) add_executable(replace_tool src/replace_tool.cpp src/pattern_replace.cpp) -target_link_libraries(replace_tool common pcre2-static) \ No newline at end of file +target_link_libraries(replace_tool common pcre2-static) diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index c1c7d9d..72f44cf 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -151,6 +151,10 @@ add_library(MESA_field_stat SHARED IMPORTED GLOBAL) set_property(TARGET MESA_field_stat PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_field_stat2.so) set_property(TARGET MESA_field_stat PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) +add_library(librdkafka SHARED IMPORTED GLOBAL) +set_property(TARGET librdkafka PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/librdkafka.so) +set_property(TARGET librdkafka PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) + ### cJSON ExternalProject_Add(cJSON PREFIX cJSON URL ${CMAKE_CURRENT_SOURCE_DIR}/cJSON-1.7.7.tar.gz @@ -167,20 +171,20 @@ add_dependencies(cjson cJSON) set_property(TARGET cjson PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib64/libcjson.a) set_property(TARGET cjson PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) -### librdkafka -ExternalProject_Add(librdkafka PREFIX librdkafka - URL ${CMAKE_CURRENT_SOURCE_DIR}/librdkafka-0.11.5.tar.gz - URL_MD5 90bb43499252317ae55723d32ccacf18 - CONFIGURE_COMMAND ./configure --prefix= - BUILD_IN_SOURCE 1) -ExternalProject_Get_Property(librdkafka INSTALL_DIR) -file(MAKE_DIRECTORY ${INSTALL_DIR}/include) - -add_library(librdkafka-static STATIC IMPORTED GLOBAL) -add_dependencies(librdkafka-static librdkafka) -set_property(TARGET librdkafka-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/librdkafka.a) -set_property(TARGET librdkafka-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) -set_property(TARGET librdkafka-static PROPERTY INTERFACE_LINK_LIBRARIES ssl crypto sasl2 m z dl pthread rt) +#### librdkafka +#ExternalProject_Add(librdkafka PREFIX librdkafka +# URL ${CMAKE_CURRENT_SOURCE_DIR}/librdkafka-0.11.5.tar.gz +# URL_MD5 90bb43499252317ae55723d32ccacf18 +# CONFIGURE_COMMAND ./configure --prefix= +# BUILD_IN_SOURCE 1) +#ExternalProject_Get_Property(librdkafka INSTALL_DIR) +#file(MAKE_DIRECTORY ${INSTALL_DIR}/include) +# +#add_library(librdkafka-static STATIC IMPORTED GLOBAL) +#add_dependencies(librdkafka-static librdkafka) +#set_property(TARGET librdkafka-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/librdkafka.a) +#set_property(TARGET librdkafka-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) +#set_property(TARGET librdkafka-static PROPERTY INTERFACE_LINK_LIBRARIES ssl crypto sasl2 m z dl pthread rt) ### ctemplate ExternalProject_Add(ctemplate PREFIX ctemplate