浏览代码

Merge branch 'CPackRPM-fixDashInRPMVersion'

Brad King 15 年之前
父节点
当前提交
9fbf64445d
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      Modules/CPackRPM.cmake

+ 5 - 0
Modules/CPackRPM.cmake

@@ -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)