From d4559878dfd7d04bcbd358641f440883c04ad3ed Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Tue, 22 Nov 2016 15:03:14 -0800 Subject: [PATCH] cmake: Removed -dirty from VERSION if git_describe fails * Removed -dirty * Also removed redundant set(PACK_PACKAGE_VERSION ... since the first gets overwritten by the second Signed-off-by: Noel Eck --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b47f776a..9dbb84e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,7 +187,7 @@ include (GetGitRevisionDescription) git_describe (VERSION "--tags") # If git_describe fails, use a dirty version if (${VERSION} MATCHES -NOTFOUND) - set (VERSION "v1.0.1-dirty") + set (VERSION "v1.0.1") message (WARNING "Failed to retrieve UPM version with 'git describe' (using " "${VERSION}). Check that git is installed and this is a valid git repo.") endif () @@ -381,7 +381,6 @@ endif() if (RPM) message (STATUS "RPM packaging enabled for ${DETECTED_ARCH}") - set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_GENERATOR "RPM") set(CPACK_PACKAGE_NAME "upm") set(upm_PACKAGE_ON_TAG ".")