X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=CMakeLists.txt;h=7c6e1cf1635bd21f3e00afaa851dea63062200db;hb=d4f18ba140f06b863ac51697d1a0d420bcd3ae6a;hp=ff39103381177a49d126ab070dbd8cb8302083df;hpb=29d871650240d6b4fba0ca46d7f13a90c004003c;p=ric-plt%2Flib%2Frmr.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff39103..7c6e1cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ add_definitions(
 	-DGIT_ID=${git_id}
 	-DMAJOR_VER=${major_version}
 	-DMINOR_VER=${minor_version}
-	-DPATCH_VER=${patch_level}${spoiled_str}
+	-DPATCH_VER=${patch_level}
 )
 
 # ---------------- suss out pkg gen tools so we don't fail generating packages that the system cannot support --------------
@@ -87,9 +87,14 @@ add_definitions(
 
 if( DEV_PKG )
 	set( dev_tag "-dev" )
+	set( pkg_name "rmr-dev" )
+else()
+	set( pkg_name "rmr" )
 endif()
-set( pkg_label "${CMAKE_PROJECT_NAME}-${major_version}.${minor_version}.${patch_level}.${CMAKE_SYSTEM_PROCESSOR}${dev_tag}" )
-message( "+++ building ${pkg_label}${spoiled_str}" )
+set( rpm_pkg_label "${CMAKE_PROJECT_NAME}${dev_tag}${spoiled_str}-${major_version}.${minor_version}.${patch_level}-${CMAKE_SYSTEM_PROCESSOR}" )
+set( deb_pkg_label "${CMAKE_PROJECT_NAME}${dev_tag}${spoiled_str}_${major_version}.${minor_version}.${patch_level}_${CMAKE_SYSTEM_PROCESSOR}" )
+message( "+++ building ${deb_pkg_label}" )
+message( "+++ building ${rpm_pkg_label}" )
 set( out_yml /tmp/build_output.yml )					# we will record package names (we record only untainted names)
 find_program( rpm NAMES rpmbuild )						# rpm package gen requires this to be installed
 
@@ -108,12 +113,12 @@ execute_process(
 )
 
 execute_process(
-	COMMAND bash -c " echo deb: ${CMAKE_CURRENT_BINARY_DIR}/${pkg_label}.deb  >>${out_yml}"
+	COMMAND bash -c " echo deb: ${CMAKE_CURRENT_BINARY_DIR}/${deb_pkg_label}.deb  >>${out_yml}"
 )
 
 if( gen_rpm )
 	execute_process(
-		COMMAND bash -c " echo rpm: ${CMAKE_CURRENT_BINARY_DIR}/${pkg_label}.rpm  >>${out_yml}"
+		COMMAND bash -c " echo rpm: ${CMAKE_CURRENT_BINARY_DIR}/${rpm_pkg_label}.rpm  >>${out_yml}"
 	)
 endif()
 
@@ -193,8 +198,6 @@ else()
 	set( need_ext 0 )
 endif()
 
-unset( SKIP_EXTERNALS  CACHE )	# prevent these from being applied next build unless specifically set on comd line
-unset( PACK_EXTERNALS  CACHE )
 
 
 # this gets us round a chicken/egg problem. include files don't exist until make is run
@@ -297,7 +300,7 @@ unset( DEV_PKG  CACHE )			# prevent from being a hiddent setting if user redoes
 # (sure would be nice if FILEs allowed for globbing; sadlyy it does not.)
 #
 if( PACK_EXTERNALS )
-	message( "including nano and nng libraries in the deb" )
+	message( "+++ including nano and nng libraries in the deb" )
 	install( FILES
 		${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libnanomsg${nano_so_suffix}
 		${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libnanomsg${nano_so_suffix_m}
@@ -310,9 +313,13 @@ if( PACK_EXTERNALS )
 	)
 endif()
 
+unset( SKIP_EXTERNALS  CACHE )	# prevent these from being applied next build unless specifically set on comd line
+unset( PACK_EXTERNALS  CACHE )
+
 IF( EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake" )
 	include( InstallRequiredSystemLibraries )
 
+	set( CPACK_PACKAGE_NAME ${pkg_name} )
 	set( CPACK_set_DESTDIR "on" )
 	set( CPACK_PACKAGING_INSTALL_PREFIX "${install_root}" )
 	set( CPACK_GENERATOR "${pkg_list}" )
@@ -324,7 +331,8 @@ IF( EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake" )
 	set( CPACK_PACKAGE_VERSION_MAJOR "${major_version}" )
 	set( CPACK_PACKAGE_VERSION_MINOR "${minor_version}" )
 	set( CPACK_PACKAGE_VERSION_PATCH "${patch_level}" )
-	set( CPACK_PACKAGE_FILE_NAME "${pkg_label}${spoiled_str}" )
+	set( CPACK_DEBIAN_FILE_NAME "${deb_pkg_label}.deb" )
+	set( CPACK_RPM_FILE_NAME "${rpm_pkg_label}.rpm" )
 
 	# we build and ship the libraries, so there is NO dependency