From 505ae8464fd16e0784b613ddabc0c9c2a13a0bb2 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Wed, 4 Nov 2020 14:27:11 +0000 Subject: [PATCH 1/2] CMake: Call mbed_set_post_build API for setting post build operations --- getting-started/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started/CMakeLists.txt b/getting-started/CMakeLists.txt index 06a6392..52dbfb6 100644 --- a/getting-started/CMakeLists.txt +++ b/getting-started/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(${APP_TARGET} mbed-psa ) -mbed_generate_bin_hex(${APP_TARGET}) +mbed_set_post_build(${APP_TARGET}) option(VERBOSE_BUILD "Have a verbose build process") if(VERBOSE_BUILD) From e701bba7cae48963f596915cb228254f96a59cfc Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 5 Nov 2020 12:02:29 +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 --- getting-started/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/getting-started/CMakeLists.txt b/getting-started/CMakeLists.txt index 52dbfb6..e2f9f38 100644 --- a/getting-started/CMakeLists.txt +++ b/getting-started/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.13 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 getting-started) -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})