更改 mrzcpd -> mrzcpd-corei7-4.*

ci/travis.sh

@@ -34,7 +34,7 @@ env | sort
 
 # Install dependency from YUM
 yum install -y libasan
-yum install -y mrzcpd
+yum install -y mrzcpd-corei7-4.*
 yum install -y libmaatframe-devel
 yum install -y libMESA_handle_logger-devel
 yum install -y libMESA_prof_load-devel

test/CMakeLists.txt

@@ -3,7 +3,7 @@
 ###############################################################################
 
 add_library(gmock_marsio gmock_marsio.cpp)
-target_include_directories(gmock_marsio PUBLIC /opt/mrzcpd/include)
+target_include_directories(gmock_marsio PUBLIC /opt/tsg/mrzcpd/corei7/include)
 
 ###############################################################################
 # temp_platform

test/gmock_marsio.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include "marsio.h"
+#include <marsio.h>
 
 struct mr_instance
 {

test/gtest_utils.h

@@ -11,7 +11,7 @@ extern "C"
 
 #include "sce.h"
 #include "log.h"
-#include "marsio.h"
+#include <marsio.h>
 #include "vxlan.h"
 #include "packet_io.h"
 #include "sf_metrics.h"

vendor/CMakeLists.txt

@@ -56,8 +56,8 @@ add_library(maatframe SHARED IMPORTED GLOBAL)
 set_property(TARGET maatframe PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libmaatframe.so)
 set_property(TARGET maatframe PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
 
-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(mrzcpd SHARED IMPORTED GLOBAL)
 set_property(TARGET mrzcpd PROPERTY IMPORTED_LOCATION ${MRZCPD_LIB_DIR}/libmarsio.so)