From 0fd72b06c1e6391c753c4090417d86420a9b448e Mon Sep 17 00:00:00 2001 From: Radoslaw Wicik Date: Wed, 17 Mar 2021 09:31:36 +0100 Subject: [PATCH] [EGD-6204] Add version.json to the udate package `versin.json` is required for update process. This commit puts it back to update package --- CMakeLists.txt | 4 ++-- cmake/modules/GenUpdateVersionJson.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02a8080dac848380f1eea689a77d89742e9d5f48..ed3ff11d14de0303fc18c3bc3a393897474a0c85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,11 +289,11 @@ if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051") DEPENDS ${ECOBOOT_FILE}-target ${ECOBOOT_DOWNLOAD_LOG} ) - add_custom_target(${VERSION_JSON_FILE}-target DEPENDS ${VERSION_JSON}) + add_custom_target(${VERSION_JSON_FILE}-target DEPENDS ${VERSION_JSON_FILE}) multicomp_install(PROGRAMS ${CMAKE_BINARY_DIR}/${ECOBOOT_FILE} DESTINATION "./" COMPONENTS Standalone Update) - multicomp_install(FILES ${VERSION_JSON} DESTINATION "./" + multicomp_install(FILES ${CMAKE_BINARY_DIR}/${VERSION_JSON_FILE} DESTINATION "./" COMPONENTS Standalone Update) endif() diff --git a/cmake/modules/GenUpdateVersionJson.cmake b/cmake/modules/GenUpdateVersionJson.cmake index 50cff7807059f060da0b20179186a205a393bcf2..50ce2e2d028c6a20b1c99c81bc9250012b04ec30 100644 --- a/cmake/modules/GenUpdateVersionJson.cmake +++ b/cmake/modules/GenUpdateVersionJson.cmake @@ -14,6 +14,7 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) +message("preparing version file") configure_file( ${SRC_DIR}/config/version.json.cmake_template ${CMAKE_BINARY_DIR}/version.json