Skip to content

Commit 0edac1c

Browse files
authored
Merge pull request #87 from rajkan01/feature-cmake-api-call-update
CMake: Call mbed_set_post_build API for setting post build operations
2 parents c920cc0 + ebe2c27 commit 0edac1c

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

NFC_EEPROM/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
4+
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
55

6-
# TODO: @mbed-os-tools MBED_ROOT and MBED_CONFIG_PATH should probably come from mbedtools
7-
set(MBED_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
6+
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
87
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "")
98
set(APP_TARGET NFC_EEPROM)
109

11-
include(${MBED_ROOT}/tools/cmake/app.cmake)
10+
include(${MBED_PATH}/tools/cmake/app.cmake)
1211

13-
add_subdirectory(${MBED_ROOT})
12+
add_subdirectory(${MBED_PATH})
1413

1514
add_executable(${APP_TARGET})
1615

@@ -40,7 +39,7 @@ target_link_libraries(${APP_TARGET}
4039
mbed-nfc
4140
)
4241

43-
mbed_generate_bin_hex(${APP_TARGET})
42+
mbed_set_post_build(${APP_TARGET})
4443

4544
option(VERBOSE_BUILD "Have a verbose build process")
4645
if(VERBOSE_BUILD)

NFC_SmartPoster/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
4+
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
55

6-
# TODO: @mbed-os-tools MBED_ROOT and MBED_CONFIG_PATH should probably come from mbedtools
7-
set(MBED_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
6+
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
87
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "")
98
set(APP_TARGET NFC_SmartPoster)
109

11-
include(${MBED_ROOT}/tools/cmake/app.cmake)
10+
include(${MBED_PATH}/tools/cmake/app.cmake)
1211

13-
add_subdirectory(${MBED_ROOT})
12+
add_subdirectory(${MBED_PATH})
1413

1514
add_executable(${APP_TARGET})
1615

@@ -39,7 +38,7 @@ target_link_libraries(${APP_TARGET}
3938
mbed-nfc
4039
)
4140

42-
mbed_generate_bin_hex(${APP_TARGET})
41+
mbed_set_post_build(${APP_TARGET})
4342

4443
option(VERBOSE_BUILD "Have a verbose build process")
4544
if(VERBOSE_BUILD)

0 commit comments

Comments
 (0)