alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Removed -dirty from VERSION if git_describe fails

Browse Source 
* Removed -dirty
    * Also removed redundant set(PACK_PACKAGE_VERSION ...
      since the first gets overwritten by the second

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2016-11-22 15:03:14 -08:00
parent 971cb4ab51
commit d4559878df
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -187,7 +187,7 @@ include (GetGitRevisionDescription)
git_describe (VERSION "--tags") git_describe (VERSION "--tags")
# If git_describe fails, use a dirty version # If git_describe fails, use a dirty version
if (${VERSION} MATCHES -NOTFOUND) 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 " message (WARNING "Failed to retrieve UPM version with 'git describe' (using "
"${VERSION}). Check that git is installed and this is a valid git repo.") "${VERSION}). Check that git is installed and this is a valid git repo.")
endif () endif ()
@ -381,7 +381,6 @@ endif()
if (RPM) if (RPM)
message (STATUS "RPM packaging enabled for ${DETECTED_ARCH}") message (STATUS "RPM packaging enabled for ${DETECTED_ARCH}")
set(CPACK_PACKAGE_VERSION ${VERSION})
set(CPACK_GENERATOR "RPM") set(CPACK_GENERATOR "RPM")
set(CPACK_PACKAGE_NAME "upm") set(CPACK_PACKAGE_NAME "upm")
set(upm_PACKAGE_ON_TAG ".") set(upm_PACKAGE_ON_TAG ".")