From 2ef3ebc5abe32f8ed18e6d162f88a7c361d09519 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 22 Feb 2017 10:08:32 +0100 Subject: [PATCH] fix snap package filename guessing --- cmake/packages/snap.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/packages/snap.cmake b/cmake/packages/snap.cmake index 6486553b99..9b9230abb3 100644 --- a/cmake/packages/snap.cmake +++ b/cmake/packages/snap.cmake @@ -7,6 +7,7 @@ endif() if(SNAPCRAFT_FOUND) set(SNAPCRAFT_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Ubuntu") set(SNAPCRAFT_SOURCE_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/SNAP") + set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}.snap") message(STATUS "Creating snap package") @@ -34,13 +35,13 @@ if(SNAPCRAFT_FOUND) add_custom_target(snap COMMENT "create snap-package" COMMAND ${SNAP_EXE} snap - COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_FILE_NAME}.snap ${PROJECT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${SNAPCRAFT_SOURCE_DIR}/${CPACK_SNAP_PACKAGE_FILE_NAME} ${PROJECT_BINARY_DIR} DEPENDS TGZ_package WORKING_DIRECTORY ${SNAPCRAFT_SOURCE_DIR} ) add_custom_target(copy_snap_packages - COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_PACKAGE_FILE_NAME}.snap ${PACKAGE_TARGET_DIR}) + COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SNAP_PACKAGE_FILE_NAME} ${PACKAGE_TARGET_DIR}) list(APPEND COPY_PACKAGES_LIST copy_snap_packages)