From fcb219c521b8d0d1bd84349279f68b8becdbc6e8 Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Tue, 18 Sep 2018 14:01:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90HTTP=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=B1=82=E6=8F=92=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=AD=A3=E9=9B=86?= =?UTF-8?q?=E6=88=90=E5=90=8Erdkafka=E7=BC=BA=E5=B0=91=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E8=BF=9E=E6=8E=A5=E5=BA=93=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/CMakeLists.txt | 2 ++ plugin/business/pangu-http/CMakeLists.txt | 3 ++- vendor/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index dd8bbc8..60d9e04 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -17,6 +17,8 @@ target_link_libraries(tfe pthread dl MESA_field_stat) target_link_libraries(tfe -Wl,--whole-archive http -Wl,--no-whole-archive) +target_link_libraries(tfe -Wl,--whole-archive pangu-http -Wl,--no-whole-archive) + #target_link_libraries(tfe -Wl,--whole-archive decrypt-mirroring -Wl,--no-whole-archive) install(TARGETS tfe RUNTIME DESTINATION ./) diff --git a/plugin/business/pangu-http/CMakeLists.txt b/plugin/business/pangu-http/CMakeLists.txt index fb43fd8..f064e3e 100644 --- a/plugin/business/pangu-http/CMakeLists.txt +++ b/plugin/business/pangu-http/CMakeLists.txt @@ -1,3 +1,4 @@ add_library(pangu-http pangu_logger.cpp pangu_http.cpp) target_link_libraries(pangu-http common http) -target_link_libraries(pangu-http librdkafka-static ctemplate-static cjson) \ No newline at end of file +target_link_libraries(pangu-http librdkafka-static ctemplate-static cjson) +target_link_libraries(pangu-http maatframe) diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index ddd6514..19dce43 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -177,6 +177,7 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include) add_library(librdkafka-static STATIC IMPORTED GLOBAL) 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 @@ -185,6 +186,7 @@ ExternalProject_Add(ctemplate PREFIX ctemplate BUILD_COMMAND sh autogen.sh CONFIGURE_COMMAND ./configure --prefix= BUILD_IN_SOURCE 1) + ExternalProject_Get_Property(ctemplate INSTALL_DIR) file(MAKE_DIRECTORY ${INSTALL_DIR}/include)