diff options
| author | fengweihao <[email protected]> | 2020-05-20 18:44:44 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2020-05-20 18:44:44 +0800 |
| commit | d5bc9581aed0092065e53622f64941486ee0431e (patch) | |
| tree | 8c3186b225041977e58afed3908d6df0cc8bddf3 /cmake | |
| parent | 633005fa246c79187e487332c9047cd017853c74 (diff) | |
修复生成RPM安装包名称错误
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Package.cmake | 9 | ||||
| -rw-r--r-- | cmake/Version.cmake | 25 |
2 files changed, 18 insertions, 16 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 9983fc4..c5022b4 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -4,14 +4,11 @@ else() set(CPACK_PACKAGE_NAME "verify-policy") endif() -message(STATUS "Package: ${CPACK_PACKAGE_NAME}") - set(CPACK_PACKAGE_VENDOR "MESASOFT") -set(CPACK_PACKAGE_VERSION_MAJOR "${VERIFY_POLIC_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${VERIFY_POLIC_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${VERIFY_POLIC_VERSION_PATCH}.${TARGET_DESCRIBE}") +set(CPACK_PACKAGE_VERSION_MAJOR "${VERIFY_POLICY_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${VERIFY_POLICY_VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${VERIFY_POLICY_VERSION_PATCH}.${TARGET_DESCRIBE}") set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) -message(STATUS "VERSION: ${VERIFY_POLIC_VERSION_MAJOR}") # RPM Build set(CPACK_GENERATOR "RPM") diff --git a/cmake/Version.cmake b/cmake/Version.cmake index f54c5fb..ea0c1b7 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -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}") |