From 1ca3b7902988b131a6c81d516e6ead047b5440cb Mon Sep 17 00:00:00 2001
From: rainbow_0206 <jiangwenjiang@huawei.com>
Date: Wed, 2 May 2018 20:32:20 +0800
Subject: Change the method of building dpdk by using rpm for centos

Change-Id: I6d59e5d9c6dbd7c6268c1e5239ec34ef8d961594
Signed-off-by: rainbow_0206 <jiangwenjiang@huawei.com>
---
 src/framework/CMakeLists.txt |  4 ++--
 src/nSocket/CMakeLists.txt   | 44 +++++++++++++++++++++-----------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 78072c6..83e9d81 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 if(WITH_HAL_LIB)
 else()
-    SET(PAL_H_DIRECTORIES "${DMM_DPDK_INSTALL_DIR}/include/dpdk/")
+    SET(PAL_H_DIRECTORIES "/usr/include/dpdk/")
     FILE(GLOB_RECURSE LIBCOMM lib_common_mem/*.c)
 endif()
 
@@ -57,4 +57,4 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_LIST_DIR}/../nSocket/nstack/event/
 	${CMAKE_CURRENT_LIST_DIR}/../nSocket/nstack/event/epoll
 	${CMAKE_CURRENT_LIST_DIR}/../nSocket/include
-)
\ No newline at end of file
+)
diff --git a/src/nSocket/CMakeLists.txt b/src/nSocket/CMakeLists.txt
index 1063f58..5701e8e 100644
--- a/src/nSocket/CMakeLists.txt
+++ b/src/nSocket/CMakeLists.txt
@@ -17,35 +17,33 @@
 
 if(WITH_HAL_LIB)
 else()
-    SET(PAL_H_DIRECTORIES "${DMM_DPDK_INSTALL_DIR}/include/dpdk/")
-    SET(DPDK_LIB_DIRECTORIES "${DMM_DPDK_INSTALL_DIR}/lib")
-    SET(DPDK_LIBS "${DPDK_LIB_DIRECTORIES}/librte_eal.so")
-    list(APPEND DPDK_LIBS "${DPDK_LIB_DIRECTORIES}/librte_mempool.so")
-    list(APPEND DPDK_LIBS "${DPDK_LIB_DIRECTORIES}/librte_mbuf.so")
-    list(APPEND DPDK_LIBS "${DPDK_LIB_DIRECTORIES}/librte_ring.so")
+    SET(PAL_H_DIRECTORIES "/usr/include/dpdk/")
 endif()
 
 INCLUDE_DIRECTORIES(
-	include/
-	kernel/
-	nstack/
-	nstack/event/
-	nstack/event/epoll
-	nstack/event/select
-	${SECUREC_SRC_H}
-        ${PAL_H_DIRECTORIES}
-	${CMAKE_CURRENT_LIST_DIR}/../adapt
-	${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/json/json-c-0.12.1
+    include/
+    kernel/
+    nstack/
+    nstack/event/
+    nstack/event/epoll
+    nstack/event/select
+    ${SECUREC_SRC_H}
+    ${PAL_H_DIRECTORIES}
+    ${CMAKE_CURRENT_LIST_DIR}/../adapt
+    ${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/json/json-c-0.12.1
 )
 
 FILE(GLOB_RECURSE nSocket *.c)
 ADD_LIBRARY(nStackAPI SHARED ${nSocket})
 TARGET_LINK_LIBRARIES(
-	nStackAPI
-	-Wl,--whole-archive
-	${LIB_PATH_STATIC}/libjson-c.a
-	${LIB_PATH_STATIC}/libglog.a
-	dmm_api
-	-Wl,--no-whole-archive,-lstdc++
-        ${DPDK_LIBS})
+    nStackAPI
+    -Wl,--whole-archive
+    ${LIB_PATH_STATIC}/libjson-c.a
+    ${LIB_PATH_STATIC}/libglog.a
+    dmm_api
+    -Wl,--no-whole-archive,-lstdc++
+    rte_eal
+    rte_mempool
+    rte_mbuf
+    rte_ring)
 ADD_DEPENDENCIES(nStackAPI dmm_api)
-- 
cgit 1.2.3-korg