Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 02:25:09 +00:00
Code Issues Releases Activity

Make version string semver compliant, add git sha

Browse Source 
Per https://semver.org/, use `-pre` rather than `_pre` version postfix,
and include the git short commit hash in the version string.
This commit is contained in:
Brenden Matthews 2024-05-01 14:33:07 -04:00
parent d8c8fd3de5
commit e8fd689b92
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Conky.cmake
View File

@ -176,11 +176,16 @@ execute_process(COMMAND ${APP_UNAME} -sm
OUTPUT_VARIABLE BUILD_ARCH OUTPUT_VARIABLE BUILD_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${APP_GIT} rev-parse --short HEAD
RESULT_VARIABLE RETVAL
OUTPUT_VARIABLE GIT_SHORT_SHA
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(RELEASE) if(RELEASE)
set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
else(RELEASE) else(RELEASE)
set(VERSION set(VERSION
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_pre${COMMIT_COUNT}") "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-pre-${GIT_SHORT_SHA}")
endif(RELEASE) endif(RELEASE)
set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2024") set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2024")