|
@@ -137,7 +137,6 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${minorver})
|
|
SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
|
|
SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
|
|
set ( CPACK_PACKAGE_CONTACT "HPCCSystems <ossdevelopment@lexisnexis.com>" )
|
|
set ( CPACK_PACKAGE_CONTACT "HPCCSystems <ossdevelopment@lexisnexis.com>" )
|
|
set( CPACK_SOURCE_GENERATOR TGZ )
|
|
set( CPACK_SOURCE_GENERATOR TGZ )
|
|
-set ( CPACK_RPM_PACKAGE_VERSION "${projname}")
|
|
|
|
SET(CPACK_RPM_PACKAGE_RELEASE "${version}${stagever}")
|
|
SET(CPACK_RPM_PACKAGE_RELEASE "${version}${stagever}")
|
|
if ( ${ARCH64BIT} EQUAL 1 )
|
|
if ( ${ARCH64BIT} EQUAL 1 )
|
|
set ( CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
|
|
set ( CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
|
|
@@ -168,7 +167,11 @@ elseif ( UNIX )
|
|
|
|
|
|
message ( "-- Auto Detecting Packaging type")
|
|
message ( "-- Auto Detecting Packaging type")
|
|
message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
|
|
message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
|
|
-
|
|
|
|
|
|
+ if ( "${packageManagement}" STREQUAL "RPM" AND WITH_PLUGINS )
|
|
|
|
+ set ( CPACK_RPM_PACKAGE_VERSION "${projname}-with-plugins")
|
|
|
|
+ else()
|
|
|
|
+ set ( CPACK_RPM_PACKAGE_VERSION "${projname}")
|
|
|
|
+ endif()
|
|
if ( "${packageManagement}" STREQUAL "DEB" )
|
|
if ( "${packageManagement}" STREQUAL "DEB" )
|
|
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
|
|
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
|
|
elseif ( "${packageManagement}" STREQUAL "RPM" )
|
|
elseif ( "${packageManagement}" STREQUAL "RPM" )
|