Skip to content

Commit cfc68a0

Browse files
committed
CMake: Use CMAKE_MODULE_PATH to locate nuvoton post build hook
We were previously relying on the global MBED_PATH variable to provide the root for the include path to the post build hooks. We can't guarantee that MBED_PATH will be set by any application building us, so use CMAKE_MODULE_PATH (which we always set) like we do for the other post-build hooks.
1 parent 1dda219 commit cfc68a0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ project(mbed-os)
2525

2626
# Add all paths to the list files within Mbed OS
2727
list(APPEND CMAKE_MODULE_PATH
28-
"${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts;${mbed-os_SOURCE_DIR}/targets/TARGET_Cypress/scripts;${mbed-os_SOURCE_DIR}/targets/TARGET_NXP/scripts"
28+
"${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts;${mbed-os_SOURCE_DIR}/targets/TARGET_Cypress/scripts;${mbed-os_SOURCE_DIR}/targets/TARGET_NXP/scripts;${mbed-os_SOURCE_DIR}/targets/TARGET_NUVOTON/scripts/"
2929
)
3030

3131
add_subdirectory(extern)

targets/TARGET_NUVOTON/TARGET_M2354/TARGET_TFM/TARGET_NU_M2354/COMPONENT_TFM_S_FW/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(${MBED_PATH}/targets/TARGET_NUVOTON/scripts/mbed_set_post_build_nuvoton.cmake)
4+
include(mbed_set_post_build_nuvoton)
55

66
target_link_libraries(mbed-m2354-tfm
77
INTERFACE

targets/TARGET_NUVOTON/scripts/mbed_set_post_build_nuvoton.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(${MBED_PATH}/tools/cmake/mbed_set_post_build.cmake)
4+
include(mbed_set_post_build)
55

66
#
77
# Sign TF-M secure and non-secure images and combine them with the bootloader

0 commit comments

Comments
 (0)