diff options
| author | fengweihao <[email protected]> | 2020-08-25 11:41:45 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2020-08-25 11:41:45 +0800 |
| commit | f507b3ea1c43f46d98ff099b6372bf1146d29b83 (patch) | |
| tree | ca6a73e04902761d8399e3229f37804995998da0 | |
| parent | 7515a1934fcc52c9218d1d8b859adbd95d05b869 (diff) | |
修复CI构建YUM安装动态库问题v2.1.2-20200828
| -rw-r--r-- | ci/travis.sh | 5 | ||||
| -rw-r--r-- | vendor/CMakeLists.txt | 9 |
2 files changed, 5 insertions, 9 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}) + |