diff options
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8daaabe3b..35871ee28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,22 +151,22 @@ endif() # ----------------------------------------------------------------------------- # Dist Target # ----------------------------------------------------------------------------- -if(EXISTS ${CMAKE_SOURCE_DIR}/.bzr/) +if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) execute_process(COMMAND - bzr revno --tree ${CMAKE_SOURCE_DIR} + git describe OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) else() set(INKSCAPE_REVISION "unknown") endif() set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}") -add_custom_target(dist - COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake - && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake - && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX} - "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" - && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +#add_custom_target(dist +# COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake +# && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake +# && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX} +# "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" +# && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake +# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") # ----------------------------------------------------------------------------- # Uninstall Target diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 2e23925c4..65903c47b 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,14 +11,14 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") -if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) +if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) execute_process(COMMAND - bzr revno --tree ${INKSCAPE_SOURCE_DIR} + git describe ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND - bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src + git status -s ${INKSCAPE_SOURCE_DIR}/src OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") |