From 121c8286da52d0f0abcbfedc7cd7c443cd736e1d Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Wed, 14 Apr 2021 12:22:53 +0100 Subject: [PATCH] CMake: set CMAKE_MODULE_PATH in the Mbed OS CMakelists.txt Update CMAKE_MODULE_PATH at once place. Note, we update also CMAKE_MODULE_PATH in app.cmake. This is temporary until we get a proper way to include Mbed Os (removing app.cmake need to be included by an application). --- CMakeLists.txt | 5 +++++ .../FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt | 1 - targets/TARGET_Cypress/CMakeLists.txt | 2 -- targets/TARGET_NXP/CMakeLists.txt | 2 -- tools/cmake/app.cmake | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a438e323d..1a06c29a81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,11 @@ include(mbed_set_linker_script) project(mbed-os) +# Add all paths to the list files within Mbed OS +list(APPEND CMAKE_MODULE_PATH + "${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" +) + add_library(mbed-core INTERFACE) add_library(mbed-os INTERFACE) diff --git a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt index d652f7c8e6..d4e2c8c889 100644 --- a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt +++ b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt @@ -40,4 +40,3 @@ target_sources(mbed-psa src/tfm_ps_ipc_api.c ) -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts") diff --git a/targets/TARGET_Cypress/CMakeLists.txt b/targets/TARGET_Cypress/CMakeLists.txt index cb0b636015..4fd9dc77e9 100644 --- a/targets/TARGET_Cypress/CMakeLists.txt +++ b/targets/TARGET_Cypress/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts") - add_subdirectory(TARGET_PSOC6 EXCLUDE_FROM_ALL) add_library(mbed-cy-external-wifi-fw INTERFACE) diff --git a/targets/TARGET_NXP/CMakeLists.txt b/targets/TARGET_NXP/CMakeLists.txt index 5563f0c0e7..e519a4453d 100644 --- a/targets/TARGET_NXP/CMakeLists.txt +++ b/targets/TARGET_NXP/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts") - add_subdirectory(TARGET_LPC11XX_11CXX EXCLUDE_FROM_ALL) add_subdirectory(TARGET_LPC176X EXCLUDE_FROM_ALL) add_subdirectory(TARGET_MCUXpresso_MCUS EXCLUDE_FROM_ALL) diff --git a/tools/cmake/app.cmake b/tools/cmake/app.cmake index cda5cf97ca..7902112781 100644 --- a/tools/cmake/app.cmake +++ b/tools/cmake/app.cmake @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Add our CMake list files to CMake default module path -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}") +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) find_program(CCACHE "ccache") if(CCACHE)