diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 23:31:49 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 23:31:49 +0000 |
| commit | 03bb87a0175289274132a0240628936fbccf6ca5 (patch) | |
| tree | 979519e873c0ceff7a6a8b0f53252a4a5ece1143 /CMakeScripts | |
| parent | Improving CR feedback. thanks! (diff) | |
| parent | When running without installing, extensions will spawn correct Inkscape (diff) | |
| download | inkscape-03bb87a0175289274132a0240628936fbccf6ca5.tar.gz inkscape-03bb87a0175289274132a0240628936fbccf6ca5.zip | |
Merge https://gitlab.com/inkscape/inkscape into selectable-knots
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 13 |
1 files changed, 6 insertions, 7 deletions
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 "") |