From 042b15d4c6943517d9b5210934d10a81d7fa8ee4 Mon Sep 17 00:00:00 2001 From: Adam Dobrowolski Date: Fri, 8 Oct 2021 15:01:53 +0200 Subject: [PATCH] [EGD-7764] Cpack script naming update Take set OS version not CMake project version --- cmake/modules/AddPackage.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/AddPackage.cmake b/cmake/modules/AddPackage.cmake index 7be655cca2acb3c6cb99cb859ed0e656f8d746e9..ff6de8097e5a28b357e653203723a46619b3b193 100644 --- a/cmake/modules/AddPackage.cmake +++ b/cmake/modules/AddPackage.cmake @@ -17,7 +17,7 @@ macro(set_cpack_vars) set(CPACK_GENERATOR "External") set(CPACK_COMPONENTS_GROUPING IGNORE) set(CPACK_EXTERNAL_ENABLE_STAGING TRUE) - set(PACKAGE_COMMON_NAME ${CPACK_PACKAGE_NAME}-${CMAKE_PROJECT_VERSION}-${CPACK_TOPLEVEL_TAG}) + set(PACKAGE_COMMON_NAME ${CPACK_PACKAGE_NAME}-${PROJECT_VERSION}-${CPACK_TOPLEVEL_TAG}) set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_COMMON_NAME}) set(PACKAGE_STAGING_DIRECTORY ${CMAKE_BINARY_DIR}/_CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}) @@ -57,7 +57,7 @@ function(add_update_package SOURCE_TARGET) endif() set(CPACK_PACKAGE_NAME ${SOURCE_TARGET}) set_cpack_vars() - set(UPDATE_PKG "${SOURCE_TARGET}-${CMAKE_PROJECT_VERSION}-${CPACK_SYSTEM_NAME}-Update.tar") + set(UPDATE_PKG "${SOURCE_TARGET}-${PROJECT_VERSION}-${CPACK_SYSTEM_NAME}-Update.tar") set(PACKAGE_UPDATE_FILE_NAME ${UPDATE_PKG} PARENT_SCOPE) set(PACKAGE_UPDATE_MIME "application/x-tar" PARENT_SCOPE) @@ -70,7 +70,7 @@ function(add_update_package SOURCE_TARGET) DEPENDS ecoboot.bin-target DEPENDS updater.bin-target DEPENDS assets - COMMAND ${CMAKE_SOURCE_DIR}/tools/generate_update_image.sh ${SOURCE_TARGET} ${CMAKE_PROJECT_VERSION} ${CPACK_SYSTEM_NAME} + COMMAND ${CMAKE_SOURCE_DIR}/tools/generate_update_image.sh ${SOURCE_TARGET} ${PROJECT_VERSION} ${CPACK_SYSTEM_NAME} WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMENT "Generating update image" )