From d5bc9581aed0092065e53622f64941486ee0431e Mon Sep 17 00:00:00 2001
From: fengweihao <fengweihao@iie.ac.cn>
Date: Wed, 20 May 2020 18:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90RPM?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8C=85=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/Package.cmake |  9 +++------
 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}")