fix(ci): Correctly set internal package name

The package name placed inside of the package was the
generic project name, and not the specially crafted -dev
or -devel name needed for the development packages to
be different from the run-time packages. This change
captures the correct name interally when a development
package is created.

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: Ia5139ba682c4c24f94becea55860ac9083a2d8c2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86e667f..9127049 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ cmake_minimum_required( VERSION 3.5 )
 
 set( major_version "1" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
 set( minor_version "0" )
-set( patch_level "35" )
+set( patch_level "36" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_lib "lib" )
@@ -346,7 +346,9 @@ unset( PACK_EXTERNALS  CACHE )
 IF( EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake" )
        include( InstallRequiredSystemLibraries )
 
-       set( CPACK_PACKAGE_NAME ${pkg_name} )
+       set( CPACK_DEBIAN_PACKAGE_NAME ${deb_pkg_name} )
+       set( CPACK_RPM_PACKAGE_NAME ${rpm_pkg_name} )
+
        set( CPACK_set_DESTDIR "on" )
        set( CPACK_PACKAGING_INSTALL_PREFIX "${install_root}" )
        set( CPACK_GENERATOR "${pkg_list}" )