diff options
| author | 刘畅 <[email protected]> | 2023-12-21 03:27:44 +0000 |
|---|---|---|
| committer | 刘畅 <[email protected]> | 2023-12-21 03:27:44 +0000 |
| commit | 71eff2932e237c5729b16445e94b8f1a88d689a1 (patch) | |
| tree | a87aeddaacd31f456950ac2d6c1b726f19e97b8f | |
| parent | 65a835ebd9bfadfda8dba461d694a93dd3ec91f3 (diff) | |
| parent | 9dd70424321d0a11c985547cb7845b98aad71e13 (diff) | |
Merge branch 'adapt_libmaa4_change_to_libmaatframe' into 'rel'v1.3.15
适配libmaat4改名为libmaatframe
See merge request tango/shaping-engine!65
| -rw-r--r-- | ci/travis.sh | 2 | ||||
| -rw-r--r-- | cmake/Package.cmake | 2 | ||||
| -rw-r--r-- | shaping/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/travis.sh b/ci/travis.sh index d62c1d0..f9c76c9 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -39,7 +39,7 @@ yum install -y tsg_master-devel yum install -y framework_env yum install -y mrzcpd yum install -y libfieldstat3-devel -yum install -y libmaat4-devel +yum install -y libmaatframe-devel yum install -y libswarmkv-devel yum install -y libMESA_handle_logger-devel yum install -y libMESA_prof_load-devel diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 16c25c5..91811cb 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -12,7 +12,7 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${DESCRIBE}") set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) -set(CPACK_RPM_PACKAGE_REQUIRES "libmaat4, libswarmkv, libfieldstat3") +set(CPACK_RPM_PACKAGE_REQUIRES "libmaatframe, libswarmkv, libfieldstat3") # RPM Build set(CPACK_GENERATOR "RPM") diff --git a/shaping/CMakeLists.txt b/shaping/CMakeLists.txt index a10cd45..cc82405 100644 --- a/shaping/CMakeLists.txt +++ b/shaping/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(shaper PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include) target_include_directories(shaper PUBLIC ${PROJECT_SOURCE_DIR}/deps/timeout) add_executable(shaping_engine src/main.cpp) target_link_libraries(shaping_engine PUBLIC shaper) -target_link_libraries(shaping_engine PUBLIC maat4) +target_link_libraries(shaping_engine PUBLIC maatframe) target_link_libraries(shaping_engine PUBLIC mrzcpd) target_link_libraries(shaping_engine PUBLIC swarmkv) target_link_libraries(shaping_engine PUBLIC jemalloc) |