diff options
| author | wangmenglan <[email protected]> | 2024-03-01 23:51:14 +0800 |
|---|---|---|
| committer | wangmenglan <[email protected]> | 2024-03-02 00:25:44 +0800 |
| commit | 4bde4e0abbb67ba847ce0ffc51380169673abc6e (patch) | |
| tree | 7c028209ba40d7f2c622ca7c3e33c3c6030b04f1 | |
| parent | bbe6cbe84844b51bf08ee08a927ba4642e1613f9 (diff) | |
解决ci编译问题v4.8.68-20240302
| -rw-r--r-- | ci/travis.sh | 2 | ||||
| -rw-r--r-- | vendor/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/travis.sh b/ci/travis.sh index 540a2dc..09e4187 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -33,7 +33,7 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" # Install dependency from YUM -yum install -y mrzcpd numactl-devel zlib-devel librdkafka-devel systemd-devel +yum install -y mrzcpd-corei7-4.* numactl-devel zlib-devel librdkafka-devel systemd-devel yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libfieldstat3-devel libMESA_handle_logger-devel libelua-devel yum install -y libMESA_htable-devel libMESA_prof_load-devel libwiredcfg-devel libWiredLB-devel sapp-devel libbreakpad_mini-devel yum install -y libasan diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 00cbbd5..a122088 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -122,8 +122,8 @@ 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) +set(MRZCPD_LIB_DIR /opt/tsg/mrzcpd/corei7/lib) +set(MRZCPD_INCLUDE_DIR /opt/tsg/mrzcpd/corei7/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) |