From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 24 Apr 2011 07:13:03 +0000 (-0400)
Subject: Suppress leading zeros:  Print version as "3.0.0a" instead of "3.000.000a"
X-Git-Tag: v3.0.0a~421
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d00ef4e5d5877364d356a394a59ca8fd89801386;p=thirdparty%2Flibarchive.git

Suppress leading zeros:  Print version as "3.0.0a" instead of "3.000.000a"

SVN-Revision: 3265
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9aa60ddd..30aa8d33a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,10 @@ STRING(REGEX REPLACE
 STRING(REGEX REPLACE
  "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]?)$" "\\1" _quality ${_version})
 SET(_version_number ${_major}${_minor}${_revision})
-STRING(REGEX REPLACE "[0]*([^0][0-9]*)$" "\\1" _minor ${_minor})
-STRING(REGEX REPLACE "[0]*([^0][0-9]*)$" "\\1" _revision ${_revision})
+STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_minor ${_minor})
+STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision})
 #
-SET(VERSION                    "${_major}.${_minor}.${_revision}${_quality}")
+SET(VERSION                    "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}")
 SET(BSDCPIO_VERSION_STRING     "${VERSION}")
 SET(BSDTAR_VERSION_STRING      "${VERSION}")
 SET(LIBARCHIVE_VERSION_NUMBER  "${_version_number}")