修复生成RPM安装包名称错误
This commit is contained in:
@@ -16,24 +16,29 @@ include(${__VERSION_CONFIG})
|
||||
|
||||
# extract major, minor, patch version from git tag
|
||||
string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERIFY_POLICY_VERSION_MAJOR "${VCS_TAG}")
|
||||
string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERIFY_POLIC_VERSION_MINOR "${VCS_TAG}")
|
||||
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERIFY_POLIC_VERSION_PATCH "${VCS_TAG}")
|
||||
string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERIFY_POLICY_VERSION_MINOR "${VCS_TAG}")
|
||||
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERIFY_POLICY_VERSION_PATCH "${VCS_TAG}")
|
||||
string(REGEX MATCH "[^-]*$" VERIFY_TAGS "${VCS_TAG}")
|
||||
|
||||
if(NOT VERIFY_POLIC_VERSION_MAJOR)
|
||||
set(VERIFY_POLIC_VERSION_MAJOR 1)
|
||||
if(VERIFY_TAGS)
|
||||
set(VERIFY_POLICY_VERSION_PATCH ${VERIFY_POLICY_VERSION_PATCH}.${VERIFY_TAGS})
|
||||
endif()
|
||||
|
||||
if(NOT VERIFY_POLIC_VERSION_MINOR)
|
||||
set(VERIFY_POLIC_VERSION_MINOR 0)
|
||||
if(NOT VERIFY_POLICY_VERSION_MAJOR)
|
||||
set(VERIFY_POLICY_VERSION_MAJOR 1)
|
||||
endif()
|
||||
|
||||
if(NOT VERIFY_POLIC_VERSION_PATCH)
|
||||
set(VERIFY_POLIC_VERSION_PATCH 0)
|
||||
if(NOT VERIFY_POLICY_VERSION_MINOR)
|
||||
set(VERIFY_POLICY_VERSION_MINOR 0)
|
||||
endif()
|
||||
|
||||
if(NOT VERIFY_POLICY_VERSION_PATCH)
|
||||
set(VERIFY_POLICY_VERSION_PATCH 0)
|
||||
endif()
|
||||
|
||||
set(TARGET_DESCRIBE "${VCS_SHORT_HASH}")
|
||||
set(TARGET_VERSION "${VERIFY_POLICY_VERSION_MAJOR}.${VERIFY_POLIC_VERSION_MINOR}.${VERIFY_POLIC_VERSION_PATCH}-${TARGET_DESCRIBE}")
|
||||
set(TARGET_GIT_VERSION "${VERIFY_POLICY_VERSION_MAJOR}.${VERIFY_POLIC_VERSION_MINOR}.${VERIFY_POLIC_VERSION_PATCH}-${TARGET_DESCRIBE}")
|
||||
set(TARGET_VERSION "${VERIFY_POLICY_VERSION_MAJOR}.${VERIFY_POLICY_VERSION_MINOR}.${VERIFY_POLICY_VERSION_PATCH}-${TARGET_DESCRIBE}")
|
||||
set(TARGET_GIT_VERSION "${VERIFY_POLICY_VERSION_MAJOR}.${VERIFY_POLICY_VERSION_MINOR}.${VERIFY_POLICY_VERSION_PATCH}-${TARGET_DESCRIBE}")
|
||||
|
||||
# Replace .- with _
|
||||
string(REGEX REPLACE "[\\.\\-]" "_" TARGET_VAR_VERSION "${TARGET_GIT_VERSION}")
|
||||
|
||||
Reference in New Issue
Block a user