diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 12 | ||||
| -rw-r--r-- | src/inkscape-version.cpp.in | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 77e5b9870..6b18e71f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,7 @@ endif() # ----------------------------------------------------------------------------- if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) execute_process( - COMMAND git log -n 1 --pretty=%ad --date=short + COMMAND git log -n 1 --pretty=%cd --date=short WORKING_DIRECTORY "${INKSCAPE_SOURCE_DIR}" OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) 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}) diff --git a/src/inkscape-version.cpp.in b/src/inkscape-version.cpp.in index b4ea5028d..9056ddf8d 100644 --- a/src/inkscape-version.cpp.in +++ b/src/inkscape-version.cpp.in @@ -3,5 +3,5 @@ #endif namespace Inkscape { - char const *version_string = VERSION " " "${INKSCAPE_REVISION}"; + char const *version_string = VERSION " " "(${INKSCAPE_REVISION})"; } |