Merge "[HICN-3] First version of packaging system based on cmake."

2 files changed, 33 insertions, 4 deletions

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 95fdd508d..9d05942ed 100755
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -23,15 +23,16 @@ set(CMAKE_MODULE_PATH
 )
 
 include(BuildMacros)
-include(Packager)
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
   find_package(Libtransport REQUIRED)
+  set(HICN_UTILS hicn-utils)
 else()
-  # TODO Set name of targets in CMakeroot file
   set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT})
 endif()
 
+include(Packaging)
+
 set (COMPILER_DEFINITIONS "-DASIO_STANDALONE")
 
 list(APPEND UTILS_SRC
@@ -47,8 +48,8 @@ foreach(util ${UTILS_SRC})
   build_executable(${util_name}
     SOURCES ${util}
     LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES}
-    DEPENDS transport
-    COMPONENT utils
+    DEPENDS ${LIBTRANSPORT}
+    COMPONENT hicn-utils
     DEFINITIONS ${COMPILER_DEFINITIONS}
   )
 endforeach()
\ No newline at end of file
diff --git a/utils/cmake/Modules/Packaging.cmake b/utils/cmake/Modules/Packaging.cmake
new file mode 100644
index 000000000..cff3d3fb1
--- /dev/null
+++ b/utils/cmake/Modules/Packaging.cmake
@@ -0,0 +1,28 @@
+# Copyright (c) 2017-2019 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(${HICN_UTILS}_DESCRIPTION
+"Hicn utils provide the hicn-ping and hiperf applications, \
+useful for testing and debugging within a hicn network."
+  CACHE STRING "Description for deb/rpm package."
+)
+
+set(${HICN_UTILS}_DEB_DEPENDENCIES
+  "libhicntransport (>= 1.0)"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${HICN_UTILS}_RPM_DEPENDENCIES
+  "libhicntransport >= 1.0"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
\ No newline at end of file