From fb42d9e019e0b21c4d98cae0e8268d63087a2034 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Thu, 28 Mar 2019 21:12:00 +0100 Subject: CMake: Fix "unknown" in version string of ppa builds For now we extract the exact version string of the ppa build (which differs from our usual version string). This should be matched to other builds, though, if somebody can figure it out. --- CMakeScripts/inkscape-version.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 163490764..119260988 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -30,6 +30,14 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") set(INKSCAPE_REVISION "${INKSCAPE_REVISION}, custom") endif() +elseif(EXISTS ${INKSCAPE_SOURCE_DIR}/debian/git-build-recipe.manifest) + # workaround for debian packaging in ppa (where we have no repo) + # TODO: figure out how to match this to standard build environments + execute_process(COMMAND sed -n 's/.*deb-version\\s*//p' git-build-recipe.manifest + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR}/debian + OUTPUT_VARIABLE DEB_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(INKSCAPE_REVISION "${DEB_VERSION}") endif() if(NOT "${INKSCAPE_BINARY_DIR}" STREQUAL "") -- cgit v1.2.3