diff options
| author | su-v <suv-sf@users.sf.net> | 2017-07-01 14:51:03 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-01 14:51:03 +0000 |
| commit | c666dd26e5ff8d4dd9381bff5c2e954ae330fc15 (patch) | |
| tree | 59fa52d68d59b1294623edc60434cc2e5fdc0df6 | |
| parent | Fix a compiling error on debian testing (diff) | |
| download | inkscape-c666dd26e5ff8d4dd9381bff5c2e954ae330fc15.tar.gz inkscape-c666dd26e5ff8d4dd9381bff5c2e954ae330fc15.zip | |
Fix version strings to work on windows & unix
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 13 |
2 files changed, 10 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bd6294ee..77e5b9870 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,11 +153,10 @@ endif() # ----------------------------------------------------------------------------- if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) execute_process( - COMMAND git show --format=format:"%ad %h" --date=short - COMMAND head -n 1 - COMMAND tr "\n" " " - OUTPUT_VARIABLE INKSCAPE_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) + COMMAND git log -n 1 --pretty=%ad --date=short + WORKING_DIRECTORY "${INKSCAPE_SOURCE_DIR}" + OUTPUT_VARIABLE INKSCAPE_REVISION + OUTPUT_STRIP_TRAILING_WHITESPACE) else() set(INKSCAPE_REVISION "unknown") endif() 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 "") |