2 files changed, 56 insertions, 69 deletions
diff --git a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake
deleted file mode 100644
index 92e9d4adb..000000000
--- a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.
-
-######################
-# Packages section
-######################
-
-set(${LIBHICNCTRL_COMPONENT}_DESCRIPTION
-  "hicn control library"
-  CACHE STRING "Description for deb/rpm package."
-)
-
-set(${LIBHICNCTRL_COMPONENT}-dev_DESCRIPTION
-  "hicn control library headers"
-  CACHE STRING "Description for deb/rpm package."
-)
-
-if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-  set(${LIBHICNCTRL_COMPONENT}_DEB_DEPENDENCIES
-    ""
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} (>= stable_version), hicn-plugin-dev (>= stable_version-release), hicn-plugin-dev (<< next_version-release)"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(${LIBHICNCTRL_COMPONENT}_RPM_DEPENDENCIES
-    ""
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} >= stable_version, hicn-plugin-dev >= stable_version-release, hicn-plugin-dev < next_version-release"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-else ()
-  set(${LIBHICNCTRL_COMPONENT}_DEB_DEPENDENCIES
-    ""
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} (>= stable_version)"
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(${LIBHICNCTRL_COMPONENT}_RPM_DEPENDENCIES
-    ""
-    CACHE STRING "Dependencies for deb/rpm package."
-  )
-
-  set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES
-    "${LIBHICNCTRL_COMPONENT} >= stable_version"
-    CACHE STRING "Dependencies for deb/rpm package."
-)
-endif()
-\ No newline at end of file
diff --git a/ctrl/libhicnctrl/cmake/packaging.cmake b/ctrl/libhicnctrl/cmake/packaging.cmake
new file mode 100644
index 000000000..74905d6c4
--- /dev/null
+++ b/ctrl/libhicnctrl/cmake/packaging.cmake
@@ -0,0 +1,56 @@
+# Copyright (c) 2021-2022 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.
+
+######################
+# Packages section
+######################
+
+set(${LIBHICNCTRL_COMPONENT}_DESCRIPTION
+  "hicn control library"
+  CACHE STRING "Description for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT}-dev_DESCRIPTION
+  "hicn control library headers"
+  CACHE STRING "Description for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT}_DEB_DEPENDENCIES
+  ""
+  CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES
+  "${LIBHICNCTRL_COMPONENT} (= stable_version)"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT}_RPM_DEPENDENCIES
+  ""
+  CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES
+  "${LIBHICNCTRL_COMPONENT} = stable_version"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT_MODULES}_DEB_DEPENDENCIES
+  "hicn-plugin (= stable_version)"
+  CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${LIBHICNCTRL_COMPONENT_MODULES}_RPM_DEPENDENCIES
+  "hicn-plugin = stable_version"
+  CACHE STRING "Dependencies for deb/rpm package."
+)