From 6ea70ad6de0037bd6a2364dca94057e7614e850c Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Wed, 4 Nov 2020 14:15:00 +0000 Subject: [PATCH 1/2] CMake: Call mbed_set_post_build API for setting post build operations --- NFC_EEPROM/CMakeLists.txt | 2 +- NFC_SmartPoster/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NFC_EEPROM/CMakeLists.txt b/NFC_EEPROM/CMakeLists.txt index a7d6a17..24513a9 100644 --- a/NFC_EEPROM/CMakeLists.txt +++ b/NFC_EEPROM/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(${APP_TARGET} mbed-nfc ) -mbed_generate_bin_hex(${APP_TARGET}) +mbed_set_post_build(${APP_TARGET}) option(VERBOSE_BUILD "Have a verbose build process") if(VERBOSE_BUILD) diff --git a/NFC_SmartPoster/CMakeLists.txt b/NFC_SmartPoster/CMakeLists.txt index 50df595..d40061d 100644 --- a/NFC_SmartPoster/CMakeLists.txt +++ b/NFC_SmartPoster/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries(${APP_TARGET} mbed-nfc ) -mbed_generate_bin_hex(${APP_TARGET}) +mbed_set_post_build(${APP_TARGET}) option(VERBOSE_BUILD "Have a verbose build process") if(VERBOSE_BUILD) From ebe2c273b61e91515e90849b10feed5ba19d584b Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 5 Nov 2020 12:00:08 +0000 Subject: [PATCH 2/2] Update CMake minimum version required from 3.18.2 to 3.19.0 Replace mbed-os source path MBED_ROOT with MBED_PATH in CMakeLists.txt --- NFC_EEPROM/CMakeLists.txt | 9 ++++----- NFC_SmartPoster/CMakeLists.txt | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/NFC_EEPROM/CMakeLists.txt b/NFC_EEPROM/CMakeLists.txt index 24513a9..0a480e6 100644 --- a/NFC_EEPROM/CMakeLists.txt +++ b/NFC_EEPROM/CMakeLists.txt @@ -1,16 +1,15 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR) +cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) -# TODO: @mbed-os-tools MBED_ROOT and MBED_CONFIG_PATH should probably come from mbedtools -set(MBED_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "") +set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "") set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "") set(APP_TARGET NFC_EEPROM) -include(${MBED_ROOT}/tools/cmake/app.cmake) +include(${MBED_PATH}/tools/cmake/app.cmake) -add_subdirectory(${MBED_ROOT}) +add_subdirectory(${MBED_PATH}) add_executable(${APP_TARGET}) diff --git a/NFC_SmartPoster/CMakeLists.txt b/NFC_SmartPoster/CMakeLists.txt index d40061d..1770f26 100644 --- a/NFC_SmartPoster/CMakeLists.txt +++ b/NFC_SmartPoster/CMakeLists.txt @@ -1,16 +1,15 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR) +cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) -# TODO: @mbed-os-tools MBED_ROOT and MBED_CONFIG_PATH should probably come from mbedtools -set(MBED_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "") +set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "") set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "") set(APP_TARGET NFC_SmartPoster) -include(${MBED_ROOT}/tools/cmake/app.cmake) +include(${MBED_PATH}/tools/cmake/app.cmake) -add_subdirectory(${MBED_ROOT}) +add_subdirectory(${MBED_PATH}) add_executable(${APP_TARGET})