From 67e7ef421ccaa941f342bb07dc48c186dc020ef5 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 8 Jul 2017 16:02:34 +0200 Subject: Improve revision format --- CMakeScripts/inkscape-version.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 40c1c4364..fdfdf35c3 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -13,15 +13,15 @@ set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git) - execute_process(COMMAND git describe + execute_process(COMMAND git rev-parse --short HEAD WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REV1 + OUTPUT_VARIABLE INKSCAPE_REV_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND git log -n 1 --pretty=%ad --date=short + execute_process(COMMAND git log -n 1 --pretty=%cd --date=short WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REV2 + OUTPUT_VARIABLE INKSCAPE_REV_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) - set(INKSCAPE_REVISION "${INKSCAPE_REV1} ${INKSCAPE_REV2}") + set(INKSCAPE_REVISION "${INKSCAPE_REV_HASH}, ${INKSCAPE_REV_DATE}") execute_process(COMMAND git status -s ${INKSCAPE_SOURCE_DIR}/src @@ -29,7 +29,7 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git) OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") - set(INKSCAPE_REVISION "${INKSCAPE_REVISION} ${INKSCAPE_CUSTOM}") + set(INKSCAPE_REVISION "${INKSCAPE_REVISION}, ${INKSCAPE_CUSTOM}") endif() endif() message("revision is " ${INKSCAPE_REVISION}) -- cgit v1.2.3