From f507b3ea1c43f46d98ff099b6372bf1146d29b83 Mon Sep 17 00:00:00 2001 From: fengweihao Date: Tue, 25 Aug 2020 11:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCI=E6=9E=84=E5=BB=BAYUM?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8A=A8=E6=80=81=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/travis.sh | 5 ++++- vendor/CMakeLists.txt | 11 ++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ci/travis.sh b/ci/travis.sh index 8065b10..5bea103 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -33,7 +33,10 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" # Install dependency from YUM -yum install -y mrzcpd framework numactl-devel zlib-devel librdkafka-devel systemd-devel + +yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libMESA_handle_logger-devel +yum install -y libMESA_htable-devel libMESA_prof_load-devel librulescan-devel libwiredcfg-devel libWiredLB-devel sapp-devel + mkdir build || true cd build diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 5ea8eeb..4a60137 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -106,8 +106,6 @@ set_property(TARGET gmock PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/ set(MESA_FRAMEWORK_LIB_DIR /opt/MESA/lib) set(MESA_FRAMEWORK_INCLUDE_DIR /opt/MESA/include) -set(MRZCPD_LIB_DIR /opt/mrzcpd/lib) -set(MRZCPD_INCLUDE_DIR /opt/mrzcpd/include) add_library(MESA_handle_logger SHARED IMPORTED GLOBAL) set_property(TARGET MESA_handle_logger PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_handle_logger.so) @@ -137,13 +135,8 @@ 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}) - -add_library(mrzcpd SHARED IMPORTED GLOBAL) -set_property(TARGET mrzcpd PROPERTY IMPORTED_LOCATION ${MRZCPD_LIB_DIR}/libmarsio.so) -set_property(TARGET mrzcpd PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MRZCPD_INCLUDE_DIR}) + +