From ac7ada20505fb1c691ef78bb8cd464a4100a0d3b Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 28 Jan 2018 15:41:45 +0100 Subject: CMake/CPack: Define INKSCAPE_CPACK_PREFIX instead of overwriting INKSCAPE_DIST_PREFIX Allows moving the CPack configuration to a more reasonable position... --- CMakeScripts/ConfigCPack.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake index 28acb8a5e..0e8421737 100644 --- a/CMakeScripts/ConfigCPack.cmake +++ b/CMakeScripts/ConfigCPack.cmake @@ -17,9 +17,9 @@ set(CPACK_PACKAGE_VERSION_PATCH ${INKSCAPE_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}${INKSCAPE_VERSION_SUFFIX}") set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj*/;tags;cscope.*") -set(INKSCAPE_DIST_PREFIX ${PROJECT_NAME}-${INKSCAPE_VERSION}_${INKSCAPE_REVISION_DATE}_${INKSCAPE_REVISION_HASH}) -set(CPACK_SOURCE_PACKAGE_FILE_NAME ${INKSCAPE_DIST_PREFIX}) -set(CPACK_PACKAGE_FILE_NAME ${INKSCAPE_DIST_PREFIX}) +set(INKSCAPE_CPACK_PREFIX ${PROJECT_NAME}-${INKSCAPE_VERSION}_${INKSCAPE_REVISION_DATE}_${INKSCAPE_REVISION_HASH}) +set(CPACK_SOURCE_PACKAGE_FILE_NAME ${INKSCAPE_CPACK_PREFIX}) +set(CPACK_PACKAGE_FILE_NAME ${INKSCAPE_CPACK_PREFIX}) set(CPACK_PACKAGE_INSTALL_DIRECTORY "inkscape") set(CPACK_SOURCE_GENERATOR "TXZ") -- cgit v1.2.3