From c666dd26e5ff8d4dd9381bff5c2e954ae330fc15 Mon Sep 17 00:00:00 2001 From: su-v Date: Sat, 1 Jul 2017 16:51:03 +0200 Subject: Fix version strings to work on windows & unix --- CMakeScripts/inkscape-version.cmake | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 12b8a26d8..9ffa7f8c7 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -14,19 +14,18 @@ set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) execute_process(COMMAND git describe - COMMAND tr "\n" " " WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REV1) - execute_process(COMMAND git show --format=format:%ad --date=short - COMMAND head -n 1 - COMMAND tr "\n" " " + OUTPUT_VARIABLE INKSCAPE_REV1 + OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND git log -n 1 --pretty=%ad --date=short WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REV2 + OUTPUT_VARIABLE INKSCAPE_REV2 OUTPUT_STRIP_TRAILING_WHITESPACE) - set(INKSCAPE_REVISION ${INKSCAPE_REV1} ${INKSCAPE_REV2}) + set(INKSCAPE_REVISION "${INKSCAPE_REV1} ${INKSCAPE_REV2}") execute_process(COMMAND git status -s ${INKSCAPE_SOURCE_DIR}/src + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") -- cgit v1.2.3