Merge branch 'CPackRPM-fixDashInRPMVersion'
This commit is contained in:
commit
9fbf64445d
|
@ -213,6 +213,11 @@ IF(NOT CPACK_RPM_PACKAGE_VERSION)
|
||||||
ENDIF(NOT CPACK_PACKAGE_VERSION)
|
ENDIF(NOT CPACK_PACKAGE_VERSION)
|
||||||
SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
|
SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
|
||||||
ENDIF(NOT CPACK_RPM_PACKAGE_VERSION)
|
ENDIF(NOT CPACK_RPM_PACKAGE_VERSION)
|
||||||
|
# Replace '-' in version with '_'
|
||||||
|
# '-' character is an Illegal RPM version character
|
||||||
|
# it is illegal because it is used to separate
|
||||||
|
# RPM "Version" from RPM "Release"
|
||||||
|
STRING(REPLACE "-" "_" CPACK_RPM_PACKAGE_VERSION ${CPACK_RPM_PACKAGE_VERSION})
|
||||||
|
|
||||||
# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
|
# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
|
||||||
IF(CPACK_RPM_PACKAGE_ARCHITECTURE)
|
IF(CPACK_RPM_PACKAGE_ARCHITECTURE)
|
||||||
|
|
Loading…
Reference in New Issue