From d48909a51f4698bff7a1a172131c297aee15338f Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 22 Jul 2017 12:49:31 +0200 Subject: cmake: drop option USES_TERMINAL from 'dist' target it was introduced in 4a543072019e0bd4a0fcaaa3c2cef718e045edc6 but requires at least cmake 3.2 therefore breaking compatibility --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a42a317fa..3d90d1349 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,8 @@ add_custom_target(dist && tar cfz ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz ${CMAKE_SOURCE_DIR}/doc --exclude=".*" --exclude-vcs-ignores || git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake COMMAND git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake # duplicate to make sure we actually revert in case of error - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" VERBATIM USES_TERMINAL) + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + VERBATIM) # ----------------------------------------------------------------------------- # Uninstall Target -- cgit v1.2.3 From f8d51951c05462f98ab120573bb8b58d15943c66 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Fri, 21 Jul 2017 05:23:07 +0200 Subject: cmake: Prepare script for 'dist'-like targets 'dist' is the same as before only difference: add date and commit hash for development and pre-release --- CMakeLists.txt | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d90d1349..42d4bbe6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,19 +161,9 @@ if (ENABLE_BINRELOC) endif() # ----------------------------------------------------------------------------- -# Dist Target +# Dist Targets # ----------------------------------------------------------------------------- -set(INKSCAPE_SOURCE_DIR ${CMAKE_SOURCE_DIR}) -include(CMakeScripts/inkscape-version.cmake) - -set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}") -add_custom_target(dist - COMMAND sed -i "s/unknown/${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake - && tar cfz ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz ${CMAKE_SOURCE_DIR}/doc --exclude=".*" --exclude-vcs-ignores - || git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake - COMMAND git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake # duplicate to make sure we actually revert in case of error - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - VERBATIM) +include(CMakeScripts/Dist.cmake) # ----------------------------------------------------------------------------- # Uninstall Target -- cgit v1.2.3