1 files changed, 23 insertions, 38 deletions

diff --git a/libtransport/src/core/CMakeLists.txt b/libtransport/src/core/CMakeLists.txt
index 5c8ab9270..777772a04 100644
--- a/libtransport/src/core/CMakeLists.txt
+++ b/libtransport/src/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -11,65 +11,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
 list(APPEND HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/facade.h
   ${CMAKE_CURRENT_SOURCE_DIR}/manifest.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/manifest_inline.h
   ${CMAKE_CURRENT_SOURCE_DIR}/manifest_format_fixed.h
   ${CMAKE_CURRENT_SOURCE_DIR}/manifest_format.h
   ${CMAKE_CURRENT_SOURCE_DIR}/pending_interest.h
   ${CMAKE_CURRENT_SOURCE_DIR}/portal.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/connector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tcp_socket_connector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/udp_socket_connector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/forwarder_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/hicn_forwarder_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/vpp_forwarder_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/errors.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_configuration.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_id_counter.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/local_connector.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_workers.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/udp_connector.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/udp_listener.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_module_manager.h
 )
 
 list(APPEND SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/content_object.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/interest.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/errors.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/packet.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/name.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/prefix.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/tcp_socket_connector.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/udp_socket_connector.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/hicn_forwarder_interface.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/manifest_format_fixed.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/connector.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/portal.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/global_configuration.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/io_module.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/udp_connector.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/udp_listener.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/constructor.cc
 )
 
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-  if (BUILD_WITH_VPP OR BUILD_HICNPLUGIN)
-    list(APPEND HEADER_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/vpp_forwarder_interface.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/hicn_vapi.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_vapi.h
-    )
-
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES Android)
+  if (UNIX AND NOT APPLE)
     list(APPEND SOURCE_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/vpp_forwarder_interface.cc
       ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.cc
-      ${CMAKE_CURRENT_SOURCE_DIR}/hicn_vapi.c
-      ${CMAKE_CURRENT_SOURCE_DIR}/memif_vapi.c
     )
-  endif()
 
-  list(APPEND HEADER_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_connector.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_interface.h
-  )
-
-  list(APPEND SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_connector.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/raw_socket_interface.cc
-  )
+    list(APPEND HEADER_FILES
+      ${CMAKE_CURRENT_SOURCE_DIR}/memif_connector.h
+    )
+  endif()
 endif()
 
 set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE)
-set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file
+set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)