1 files changed, 27 insertions, 16 deletions
diff --git a/hicn-plugin/CMakeLists.txt b/hicn-plugin/CMakeLists.txt
index ab4c8f648..8425a5cf3 100644
--- a/hicn-plugin/CMakeLists.txt
+++ b/hicn-plugin/CMakeLists.txt
@@ -55,25 +55,31 @@ set(LIBHICN_FILES
 )
 
 set(LIBHICN_HEADER_FILES_SRC
-    ../lib/src/hicn.h
-    ../lib/src/base.h
-    ../lib/src/common.h
-    ../lib/src/error.h
-    ../lib/src/header.h
-    ../lib/src/name.h
-    ../lib/src/protocol.h
-    ../lib/src/ops.h
-    ../lib/src/mapme.h
+    ../lib/includes/hicn/hicn.h
+    ../lib/includes/hicn/base.h
+    ../lib/includes/hicn/common.h
+    ../lib/includes/hicn/error.h
+    ../lib/includes/hicn/header.h
+    ../lib/includes/hicn/name.h
+    ../lib/includes/hicn/protocol.h
+    ../lib/includes/hicn/ops.h
+    ../lib/includes/hicn/mapme.h
 )
 
 set(LIBHICN_HEADER_FILES_PROTOCOL
-    ../lib/src/protocol/ah.h
-    ../lib/src/protocol/icmp.h
-    ../lib/src/protocol/icmprd.h
-    ../lib/src/protocol/ipv4.h
-    ../lib/src/protocol/ipv6.h
-    ../lib/src/protocol/tcp.h
-    ../lib/src/protocol/udp.h
+    ../lib/includes/hicn/protocol/ah.h
+    ../lib/includes/hicn/protocol/icmp.h
+    ../lib/includes/hicn/protocol/icmprd.h
+    ../lib/includes/hicn/protocol/ipv4.h
+    ../lib/includes/hicn/protocol/ipv6.h
+    ../lib/includes/hicn/protocol/tcp.h
+    ../lib/includes/hicn/protocol/udp.h
+)
+
+set(LIBHICN_HEADER_FILES_UTIL
+    ../lib/includes/hicn/util/ip_address.h
+    ../lib/includes/hicn/util/token.h
+    ../lib/includes/hicn/util/types.h
 )
 
 set(HICN_PLUGIN_SOURCE_FILES
@@ -189,6 +195,9 @@ set(HICN_VAPI_GENERATED_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/hicn/hicn.api.vapi.h
     ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/hicn/hicn.api.vapi.hpp)
 
+set(HICN_VPP_STARTUP_CONF_FILE
+    ${CMAKE_BINARY_DIR}/startup.conf)
+
 if (NOT VPP_HOME)
     set(VPP_HOME /usr)
 endif()
@@ -259,6 +268,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins)
 
 file(COPY ${LIBHICN_HEADER_FILES_SRC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/hicn)
 file(COPY ${LIBHICN_HEADER_FILES_PROTOCOL} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/hicn/protocol)
+file(COPY ${LIBHICN_HEADER_FILES_UTIL} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/hicn/util)
 
 add_library(hicn_api_test_plugin SHARED
 	${HICN_API_TEST_SOURCE_FILES}
@@ -266,6 +276,7 @@ add_library(hicn_api_test_plugin SHARED
 
 set(VPP_INSTALL_PLUGIN ${HICN_INSTALL_PREFIX}/vpp_plugins)
 set(VPP_INSTALL_API_TEST_PLUGIN ${HICN_INSTALL_PREFIX}/vpp_api_test_plugins CACHE STRING "vpp_install_api_test_plugin")
+set(VPP_STARTUP_CONF /etc/vpp/)
 
 set_target_properties(hicn_plugin
         PROPERTIES