Maybe fix git revision numbers in RPM packages.
This commit is contained in:
parent
7e1b6ef6c4
commit
c4280c2cf4
@ -34,7 +34,7 @@ if(CLEMENTINE_VERSION_PRERELEASE)
|
|||||||
set(CLEMENTINE_VERSION_RPM "${CLEMENTINE_VERSION_RPM}${CLEMENTINE_VERSION_PRERELEASE}")
|
set(CLEMENTINE_VERSION_RPM "${CLEMENTINE_VERSION_RPM}${CLEMENTINE_VERSION_PRERELEASE}")
|
||||||
endif(CLEMENTINE_VERSION_PRERELEASE)
|
endif(CLEMENTINE_VERSION_PRERELEASE)
|
||||||
|
|
||||||
# Add svn revision
|
# Add git revision
|
||||||
if(FORCE_GIT_REVISION)
|
if(FORCE_GIT_REVISION)
|
||||||
set(GIT_REVISION ${FORCE_GIT_REVISION})
|
set(GIT_REVISION ${FORCE_GIT_REVISION})
|
||||||
else(FORCE_GIT_REVISION)
|
else(FORCE_GIT_REVISION)
|
||||||
@ -55,5 +55,7 @@ endif(FORCE_GIT_REVISION)
|
|||||||
if(INCLUDE_GIT_REVISION AND GIT_REVISION)
|
if(INCLUDE_GIT_REVISION AND GIT_REVISION)
|
||||||
set(CLEMENTINE_VERSION_DISPLAY "${GIT_REVISION}")
|
set(CLEMENTINE_VERSION_DISPLAY "${GIT_REVISION}")
|
||||||
set(CLEMENTINE_VERSION_DEB "${GIT_REVISION}")
|
set(CLEMENTINE_VERSION_DEB "${GIT_REVISION}")
|
||||||
set(CLEMENTINE_VERSION_RPM "${GIT_REVISION}")
|
|
||||||
|
# RPM doesn't like dashes in version numbers
|
||||||
|
string(REPLACE "-" "." CLEMENTINE_VERSION_RPM "${GIT_REVISION}")
|
||||||
endif(INCLUDE_GIT_REVISION AND GIT_REVISION)
|
endif(INCLUDE_GIT_REVISION AND GIT_REVISION)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user