From 08233d44a6cfde878d7e10bca38ae935ed1c8fd5 Mon Sep 17 00:00:00 2001
From: Mauro <you@example.com>
Date: Wed, 30 Jun 2021 07:57:22 +0000
Subject: [HICN-713] Transport Library Major Refactoring 2

Co-authored-by: Luca Muscariello <muscariello@ieee.org>
Co-authored-by: Michele Papalini <micpapal@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Giulio Grassi <gigrassi@cisco.com>
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I5b2c667bad66feb45abdb5effe22ed0f6c85d1c2
---
 .../cmake/Modules/DefaultConfiguration.cmake       |  2 +-
 libtransport/cmake/Modules/Ios.cmake               |  3 -
 libtransport/cmake/Modules/Packaging.cmake         | 77 ++++++++++------------
 3 files changed, 35 insertions(+), 47 deletions(-)

(limited to 'libtransport/cmake')

diff --git a/libtransport/cmake/Modules/DefaultConfiguration.cmake b/libtransport/cmake/Modules/DefaultConfiguration.cmake
index 93dd90164..402ad86f5 100644
--- a/libtransport/cmake/Modules/DefaultConfiguration.cmake
+++ b/libtransport/cmake/Modules/DefaultConfiguration.cmake
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # C/c++ standard
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 11)
 
 # Compilation flags
diff --git a/libtransport/cmake/Modules/Ios.cmake b/libtransport/cmake/Modules/Ios.cmake
index a4e625e98..1b2aae2bf 100644
--- a/libtransport/cmake/Modules/Ios.cmake
+++ b/libtransport/cmake/Modules/Ios.cmake
@@ -15,9 +15,6 @@ function (configure_ios_environment)
   find_host_package ( OpenSSL REQUIRED )
   include_directories(extras/iOS)
 
-  find_host_package(Libparc REQUIRED)
-  include_directories(${LIBPARC_INCLUDE_DIRS})
-
   find_host_package(Libhicn REQUIRED)
   include_directories(${HICN_INCLUDE_DIRS})
 endfunction()
\ No newline at end of file
diff --git a/libtransport/cmake/Modules/Packaging.cmake b/libtransport/cmake/Modules/Packaging.cmake
index e24172661..c885c6911 100644
--- a/libtransport/cmake/Modules/Packaging.cmake
+++ b/libtransport/cmake/Modules/Packaging.cmake
@@ -17,60 +17,51 @@
 # Packages section
 ######################
 
-set(lib${LIBTRANSPORT}_DESCRIPTION
+set(${LIBTRANSPORT_COMPONENT}_DESCRIPTION
 "Libhicn-transport provides transport services and \
 socket API for applications willing to communicate \
 using the hICN protocol stack."
   CACHE STRING "Description for deb/rpm package."
 )
 
-set(lib${LIBTRANSPORT}-dev_DESCRIPTION ${lib${LIBTRANSPORT}_DESCRIPTION}
-  CACHE STRING "Description for deb/rpm package.")
-set(lib${LIBTRANSPORT}-devel_DESCRIPTION ${lib${LIBTRANSPORT}_DESCRIPTION}
-  CACHE STRING "Description for deb/rpm package.")
-
-if ((BUILD_MEMIF_CONNECTOR OR BUILD_HICNPLUGIN) AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-
-  set(lib${LIBTRANSPORT}_DEB_DEPENDENCIES
-    "lib${LIBHICN} (>= stable_version), libparc (>= 1.0), libmemif (>= stable_version), vpp (>= stable_version-release), vpp (<< next_version-release), hicn-plugin (>= stable_version)"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(lib${LIBTRANSPORT}_RPM_DEPENDENCIES
-    "lib${LIBHICN} >= stable_version, libparc >= 1.0, libmemif >= stable_version, vpp >= stable_version-release, vpp < next_version-release, hicn-plugin >= stable_version"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(${LIBTRANSPORT_COMPONENT}-dev_DESCRIPTION
+  CACHE STRING "Header files for developing using libhicntransport."
+)
 
-  set(lib${LIBTRANSPORT}-dev_DEB_DEPENDENCIES
-    "lib${LIBTRANSPORT} (>= stable_version), libasio-dev (>= 1.10), libhicn-dev (>= stable_version), libmemif-dev (>= stable_version), libparc-dev (>= 1.0), vpp-dev (>= stable_version-release), vpp-dev (<< next_version-release), hicn-plugin-dev (>= stable_version)"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(lib${LIBTRANSPORT}-devel_DESCRIPTION
+  CACHE STRING "Header files for developing using libhicntransport."
+)
 
-  set(lib${LIBTRANSPORT}-dev_RPM_DEPENDENCIES
-    "lib${LIBTRANSPORT} >= stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel >= stable_version, libmemif-devel >= stable_version, libparc-devel >= 1.0, vpp-devel >= stable_version-release, vpp-devel < next_version-release, hicn-plugin-dev >= stable_version"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(${LIBTRANSPORT_COMPONENT}-io-modules_DESCRIPTION
+  CACHE STRING "Additional io modules for libhicntransport, including the memif connector for vpp."
+)
 
-else()
+set(${LIBTRANSPORT_COMPONENT}_DEB_DEPENDENCIES
+  "lib${LIBHICN} (>= stable_version), libparc (>= 1.0), libconfig++9v5 (>= 1.5-0.4build1)"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
 
-  set(lib${LIBTRANSPORT}_DEB_DEPENDENCIES
-    "lib${LIBHICN} (>= stable_version), libparc (>= 1.0)"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(${LIBTRANSPORT_COMPONENT}_RPM_DEPENDENCIES
+  "lib${LIBHICN} >= stable_version, libparc >= 1.0, libconfig >= 1.5-9.el8"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
 
-  set(lib${LIBTRANSPORT}_RPM_DEPENDENCIES
-    "lib${LIBHICN} >= stable_version, libparc >= 1.0"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(${LIBTRANSPORT_COMPONENT}-dev_DEB_DEPENDENCIES
+  "${LIBTRANSPORT} (>= stable_version), libasio-dev (>= 1.10), lib${LIBHICN}-dev (>= stable_version), libparc-dev (>= 1.0), libconfig++-dev (>= 1.5-0.4build1)"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
 
-  set(lib${LIBTRANSPORT}-dev_DEB_DEPENDENCIES
-    "lib${LIBTRANSPORT} (>= stable_version), libasio-dev (>= 1.10), lib${LIBHICN}-dev (>= stable_version), libparc-dev (>= 1.0)"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(${LIBTRANSPORT_COMPONENT}-dev_RPM_DEPENDENCIES
+  "${LIBTRANSPORT} >= stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel >= stable_version, libparc-devel >= 1.0, libconfig-devel >= 1.5-9.el8"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
 
-  set(lib${LIBTRANSPORT}-dev_RPM_DEPENDENCIES
-    "lib${LIBTRANSPORT} >= stable_version, asio-devel >= 1.10, lib${LIBHICN}-devel >= stable_version, libparc-devel >= 1.0"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
+set(${LIBTRANSPORT_COMPONENT}-io-modules_DEB_DEPENDENCIES
+  "${LIBTRANSPORT} (>= stable_version), libmemif (>= stable_version), vpp (>= stable_version-release), vpp (<< next_version-release), hicn-plugin (>= stable_version)"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
 
-endif()
\ No newline at end of file
+set(${LIBTRANSPORT_COMPONENT}-io-modules_RPM_DEPENDENCIES
+  "${LIBTRANSPORT} >= stable_version, libmemif >= stable_version, vpp >= stable_version-release, vpp < next_version-release, hicn-plugin >= stable_version"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
-- 
cgit 1.2.3-korg